| 1 |
# Kernel >= 2.6.24.1 highly recommended |
| 2 |
# Fixes injection speed (up to 350 pps) |
| 3 |
# Fixes fragmented injection (requires mac80211 patch too) |
| 4 |
diff -bBur linux-2.6.24.4/drivers/net/wireless/b43/main.c linux-2.6.24.4-sud/drivers/net/wireless/b43/main.c |
| 5 |
--- linux-2.6.24.4/drivers/net/wireless/b43/main.c 2008-04-05 16:25:11.000000000 +0200 |
| 6 |
+++ linux-2.6.24.4-sud/drivers/net/wireless/b43/main.c 2008-04-05 16:45:11.000000000 +0200 |
| 7 |
@@ -2516,6 +2516,11 @@ |
| 8 |
goto out; |
| 9 |
if (unlikely(b43_status(dev) < B43_STAT_STARTED)) |
| 10 |
goto out; |
| 11 |
+ |
| 12 |
+ if (ctl->type == IEEE80211_IF_TYPE_MNTR) { |
| 13 |
+ ctl->flags |= IEEE80211_TXCTL_NO_ACK; |
| 14 |
+ } |
| 15 |
+ |
| 16 |
/* DMA-TX is done without a global lock. */ |
| 17 |
if (b43_using_pio(dev)) { |
| 18 |
spin_lock_irqsave(&wl->irq_lock, flags); |
| 19 |
diff -bBur linux-2.6.24.4/drivers/net/wireless/b43/xmit.c linux-2.6.24.4-sud/drivers/net/wireless/b43/xmit.c |
| 20 |
--- linux-2.6.24.4/drivers/net/wireless/b43/xmit.c 2008-04-05 16:25:11.000000000 +0200 |
| 21 |
+++ linux-2.6.24.4-sud/drivers/net/wireless/b43/xmit.c 2008-04-05 16:48:51.000000000 +0200 |
| 22 |
@@ -295,7 +295,8 @@ |
| 23 |
/* MAC control */ |
| 24 |
if (!(txctl->flags & IEEE80211_TXCTL_NO_ACK)) |
| 25 |
mac_ctl |= B43_TX4_MAC_ACK; |
| 26 |
- if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) && |
| 27 |
+ if ( (txctl->type != IEEE80211_IF_TYPE_MNTR) && |
| 28 |
+ !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) && |
| 29 |
((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL))) |
| 30 |
mac_ctl |= B43_TX4_MAC_HWSEQ; |
| 31 |
if (txctl->flags & IEEE80211_TXCTL_FIRST_FRAGMENT) |
| 32 |
diff -bBur linux-2.6.24.4/drivers/net/wireless/b43legacy/main.c linux-2.6.24.4-sud/drivers/net/wireless/b43legacy/main.c |
| 33 |
--- linux-2.6.24.4/drivers/net/wireless/b43legacy/main.c 2008-04-05 16:25:11.000000000 +0200 |
| 34 |
+++ linux-2.6.24.4-sud/drivers/net/wireless/b43legacy/main.c 2008-04-05 16:45:11.000000000 +0200 |
| 35 |
@@ -2379,6 +2379,11 @@ |
| 36 |
goto out; |
| 37 |
if (unlikely(b43legacy_status(dev) < B43legacy_STAT_STARTED)) |
| 38 |
goto out; |
| 39 |
+ |
| 40 |
+ if (ctl->type == IEEE80211_IF_TYPE_MNTR) { |
| 41 |
+ ctl->flags |= IEEE80211_TXCTL_NO_ACK; |
| 42 |
+ } |
| 43 |
+ |
| 44 |
/* DMA-TX is done without a global lock. */ |
| 45 |
if (b43legacy_using_pio(dev)) { |
| 46 |
spin_lock_irqsave(&wl->irq_lock, flags); |
| 47 |
diff -bBur linux-2.6.24.4/drivers/net/wireless/b43legacy/xmit.c linux-2.6.24.4-sud/drivers/net/wireless/b43legacy/xmit.c |
| 48 |
--- linux-2.6.24.4/drivers/net/wireless/b43legacy/xmit.c 2008-04-05 16:25:11.000000000 +0200 |
| 49 |
+++ linux-2.6.24.4-sud/drivers/net/wireless/b43legacy/xmit.c 2008-04-05 16:49:02.000000000 +0200 |
| 50 |
@@ -290,7 +290,8 @@ |
| 51 |
/* MAC control */ |
| 52 |
if (!(txctl->flags & IEEE80211_TXCTL_NO_ACK)) |
| 53 |
mac_ctl |= B43legacy_TX4_MAC_ACK; |
| 54 |
- if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) && |
| 55 |
+ if ( (txctl->type != IEEE80211_IF_TYPE_MNTR) && |
| 56 |
+ !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) && |
| 57 |
((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL))) |
| 58 |
mac_ctl |= B43legacy_TX4_MAC_HWSEQ; |
| 59 |
if (txctl->flags & IEEE80211_TXCTL_FIRST_FRAGMENT) |