| 1 |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c |
| 2 |
index a37d7fa..5655688 100644 |
| 3 |
--- a/drivers/net/wireless/b43/main.c |
| 4 |
+++ b/drivers/net/wireless/b43/main.c |
| 5 |
@@ -2841,6 +2841,10 @@ static int b43_op_tx(struct ieee80211_hw *hw, |
| 6 |
err = b43_dma_tx(dev, skb, ctl); |
| 7 |
} |
| 8 |
|
| 9 |
+ if (ctl->type == IEEE80211_IF_TYPE_MNTR) { |
| 10 |
+ ctl->flags |= IEEE80211_TXCTL_NO_ACK; |
| 11 |
+ } |
| 12 |
+ |
| 13 |
read_unlock_irqrestore(&wl->tx_lock, flags); |
| 14 |
|
| 15 |
if (unlikely(err)) |
| 16 |
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c |
| 17 |
index 8849194..bfc1665 100644 |
| 18 |
--- a/drivers/net/wireless/b43/xmit.c |
| 19 |
+++ b/drivers/net/wireless/b43/xmit.c |
| 20 |
@@ -318,7 +318,8 @@ int b43_generate_txhdr(struct b43_wldev *dev, |
| 21 |
/* MAC control */ |
| 22 |
if (!(txctl->flags & IEEE80211_TXCTL_NO_ACK)) |
| 23 |
mac_ctl |= B43_TXH_MAC_ACK; |
| 24 |
- if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) && |
| 25 |
+ if ( (txctl->type != IEEE80211_IF_TYPE_MNTR) && |
| 26 |
+ !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) && |
| 27 |
((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL))) |
| 28 |
mac_ctl |= B43_TXH_MAC_HWSEQ; |
| 29 |
if (txctl->flags & IEEE80211_TXCTL_FIRST_FRAGMENT) |
| 30 |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c |
| 31 |
index a353dae..14ef22e 100644 |
| 32 |
--- a/drivers/net/wireless/b43legacy/main.c |
| 33 |
+++ b/drivers/net/wireless/b43legacy/main.c |
| 34 |
@@ -2370,6 +2370,11 @@ static int b43legacy_op_tx(struct ieee80211_hw *hw, |
| 35 |
goto out; |
| 36 |
if (unlikely(b43legacy_status(dev) < B43legacy_STAT_STARTED)) |
| 37 |
goto out; |
| 38 |
+ |
| 39 |
+ if (ctl->type == IEEE80211_IF_TYPE_MNTR) { |
| 40 |
+ ctl->flags |= IEEE80211_TXCTL_NO_ACK; |
| 41 |
+ } |
| 42 |
+ |
| 43 |
/* DMA-TX is done without a global lock. */ |
| 44 |
if (b43legacy_using_pio(dev)) { |
| 45 |
spin_lock_irqsave(&wl->irq_lock, flags); |
| 46 |
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c |
| 47 |
index fc83dab..b4c6ebb 100644 |
| 48 |
--- a/drivers/net/wireless/b43legacy/xmit.c |
| 49 |
+++ b/drivers/net/wireless/b43legacy/xmit.c |
| 50 |
@@ -292,7 +292,8 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, |
| 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) |