Debian Codegraph @

patches/old/b43-injection-2.6.26-rc6-wl.patch

raw
1 diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
2 index f9e1cff..d2d4f37 100644
3 --- a/drivers/net/wireless/b43/xmit.c
4 +++ b/drivers/net/wireless/b43/xmit.c
5 @@ -315,9 +315,15 @@ 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 - if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
18 + if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
19 + !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
20 ((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)))
21 mac_ctl |= B43_TXH_MAC_HWSEQ;
22 if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
23 diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
24 index 82dc04d..1f9f443 100644
25 --- a/drivers/net/wireless/b43legacy/xmit.c
26 +++ b/drivers/net/wireless/b43legacy/xmit.c
27 @@ -293,9 +293,15 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
28 }
29
30 /* MAC control */
31 - if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
32 + /* dev->wl->if_type returns IEEE80211_IF_TYPE_INVALID instead of
33 + * IEEE80211_IF_TYPE_MNTR for monitor interfaces, as monitor mode
34 + * is not considered "operating" by mac80211.
35 + */
36 + if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
37 + !(info->flags & IEEE80211_TX_CTL_NO_ACK))
38 mac_ctl |= B43legacy_TX4_MAC_ACK;
39 - if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
40 + if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
41 + !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
42 ((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)))
43 mac_ctl |= B43legacy_TX4_MAC_HWSEQ;
44 if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)