Debian Codegraph @

patches/b43-injection-2.6.26-wl.patch

raw
1 diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
2 index 8d54502..3e0e088 100644
3 --- a/drivers/net/wireless/b43/xmit.c
4 +++ b/drivers/net/wireless/b43/xmit.c
5 @@ -315,10 +315,16 @@ int b43_generate_txhdr(struct b43_wldev *dev,
6 }
7
8 /* MAC control */
9 - if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
10 + /* dev->wl->if_type returns IEEE80211_IF_TYPE_INVALID instead of
11 + * IEEE80211_IF_TYPE_MNTR for monitor interfaces, as monitor mode
12 + * is not considered "operating" by mac80211.
13 + */
14 + if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
15 + !(info->flags & IEEE80211_TX_CTL_NO_ACK))
16 mac_ctl |= B43_TXH_MAC_ACK;
17 /* use hardware sequence counter as the non-TID counter */
18 - if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
19 + if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
20 + info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
21 mac_ctl |= B43_TXH_MAC_HWSEQ;
22 if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
23 mac_ctl |= B43_TXH_MAC_STMSDU;
24 diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
25 index e969ed8..c19409e 100644
26 --- a/drivers/net/wireless/b43legacy/xmit.c
27 +++ b/drivers/net/wireless/b43legacy/xmit.c
28 @@ -293,9 +293,15 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
29 }
30
31 /* MAC control */
32 - if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
33 + /* dev->wl->if_type returns IEEE80211_IF_TYPE_INVALID instead of
34 + * IEEE80211_IF_TYPE_MNTR for monitor interfaces, as monitor mode
35 + * is not considered "operating" by mac80211.
36 + */
37 + if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
38 + !(info->flags & IEEE80211_TX_CTL_NO_ACK))
39 mac_ctl |= B43legacy_TX4_MAC_ACK;
40 - if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
41 + if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
42 + info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
43 mac_ctl |= B43legacy_TX4_MAC_HWSEQ;
44 if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
45 mac_ctl |= B43legacy_TX4_MAC_STMSDU;