diff options
| author | Michael Buesch <mb@bu3sch.de> | 2007-10-28 16:19:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:03:30 +0100 |
| commit | 74cfdba7ce7b601559a4bcdc9054baf1bdc6948d (patch) | |
| tree | 72eef3f57fbc3cf4d2170a45a179e7d89a5c5429 /drivers/net/wireless/b43/xmit.c | |
| parent | b43: Dereference of wl->current_dev must be protected by wl->mutex (diff) | |
| download | linux-74cfdba7ce7b601559a4bcdc9054baf1bdc6948d.tar.xz linux-74cfdba7ce7b601559a4bcdc9054baf1bdc6948d.zip | |
b43: Use the retry limit parameters from mac80211
Use the limits provided by mac80211.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index bcbb32872e85..3659438e637c 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -294,6 +294,8 @@ static void generate_txhdr_fw4(struct b43_wldev *dev, mac_ctl |= B43_TX4_MAC_STMSDU; if (phy->type == B43_PHYTYPE_A) mac_ctl |= B43_TX4_MAC_5GHZ; + if (txctl->flags & IEEE80211_TXCTL_LONG_RETRY_LIMIT) + mac_ctl |= B43_TX4_MAC_LONGFRAME; /* Generate the RTS or CTS-to-self frame */ if ((txctl->flags & IEEE80211_TXCTL_USE_RTS_CTS) || @@ -342,7 +344,6 @@ static void generate_txhdr_fw4(struct b43_wldev *dev, b43_plcp_get_ratecode_cck(rts_rate); if (rts_rate_fb_ofdm) extra_ft |= B43_TX4_EFT_RTSFBOFDM; - mac_ctl |= B43_TX4_MAC_LONGFRAME; } /* Magic cookie */ |