From 74cfdba7ce7b601559a4bcdc9054baf1bdc6948d Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sun, 28 Oct 2007 16:19:44 +0100 Subject: b43: Use the retry limit parameters from mac80211 Use the limits provided by mac80211. Signed-off-by: Michael Buesch Cc: Larry Finger Signed-off-by: John W. Linville --- drivers/net/wireless/b43/xmit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/net/wireless/b43/xmit.c') 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 */ -- cgit v1.2.3-59-g8ed1b