From 820c7479d7df3cf310340ccac4d7a937c0c003f0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 11 Dec 2020 17:23:11 +0800
Subject: [PATCH] merge upstream

---
 modules/wifi/wifi.go                         | 4 ++--
 modules/wifi/wifi_channel_switch_announce.go | 4 +++-
 modules/wifi/wifi_deauth.go                  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/wifi/wifi.go b/modules/wifi/wifi.go
index af619a00..0fdebaa9 100644
--- a/modules/wifi/wifi.go
+++ b/modules/wifi/wifi.go
@@ -216,8 +216,8 @@ func NewWiFiModule(s *session.Session) *WiFiModule {
 				return fmt.Errorf("%d is not a valid channel number",channel)
 			}
 			packet_count,_:=strconv.Atoi( args[2])
-			if packet_count>65535{
-				packet_count=65535
+			if packet_count>1000{
+				packet_count=1000
 			}
 			return mod.startCSA(bssid,int8(channel),packet_count)
 		})
diff --git a/modules/wifi/wifi_channel_switch_announce.go b/modules/wifi/wifi_channel_switch_announce.go
index ca8356b3..29c31cf8 100644
--- a/modules/wifi/wifi_channel_switch_announce.go
+++ b/modules/wifi/wifi_channel_switch_announce.go
@@ -28,7 +28,9 @@ func (mod *WiFiModule) sendBeaconWithCSA_Packet(ap *network.AccessPoint, to_chan
 			mod.Error("could not create beacon packet: %s", err)
 			continue
 		} else {
-			mod.injectPacket(pkt)
+			mod.onChannel(ap.Channel, func() {
+				mod.injectPacket(pkt)
+			})
 		}
 	}
 }
diff --git a/modules/wifi/wifi_deauth.go b/modules/wifi/wifi_deauth.go
index 050bd63e..110a8a13 100644
--- a/modules/wifi/wifi_deauth.go
+++ b/modules/wifi/wifi_deauth.go
@@ -19,7 +19,7 @@ func (mod *WiFiModule) injectPacket(data []byte) {
 		mod.Session.Queue.TrackSent(uint64(len(data)))
 	}
 	// let the network card breath a little
-	time.Sleep(10 * time.Millisecond)
+	time.Sleep(1 * time.Millisecond)
 }
 
 func (mod *WiFiModule) sendDeauthPacket(ap net.HardwareAddr, client net.HardwareAddr) {