diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-14 23:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 23:40:34 -0400 |
| commit | fc943b12e48f9341bce48c2fadf094cc721aab93 (patch) | |
| tree | 8c3244d7f5fae4edbfe0a5103789b0bc5c64f478 /drivers/net/wireless/b43legacy/xmit.c | |
| parent | 72d9794f444734af56ef12833b496326643e2964 (diff) | |
| parent | 4c9adafff7d910f142fe44fae37ed12c6b99f20f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/xmit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c index a3540787eb50..e969ed8d412d 100644 --- a/drivers/net/wireless/b43legacy/xmit.c +++ b/drivers/net/wireless/b43legacy/xmit.c | |||
| @@ -295,8 +295,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, | |||
| 295 | /* MAC control */ | 295 | /* MAC control */ |
| 296 | if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) | 296 | if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) |
| 297 | mac_ctl |= B43legacy_TX4_MAC_ACK; | 297 | mac_ctl |= B43legacy_TX4_MAC_ACK; |
| 298 | if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) && | 298 | if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) |
| 299 | ((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL))) | ||
| 300 | mac_ctl |= B43legacy_TX4_MAC_HWSEQ; | 299 | mac_ctl |= B43legacy_TX4_MAC_HWSEQ; |
| 301 | if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT) | 300 | if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT) |
| 302 | mac_ctl |= B43legacy_TX4_MAC_STMSDU; | 301 | mac_ctl |= B43legacy_TX4_MAC_STMSDU; |