diff options
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
-rw-r--r-- | drivers/net/wireless/b43/xmit.c | 60 |
1 files changed, 49 insertions, 11 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 2fabcf8f047..adba89b816d 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c | |||
@@ -185,7 +185,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, | |||
185 | u8 *_txhdr, | 185 | u8 *_txhdr, |
186 | const unsigned char *fragment_data, | 186 | const unsigned char *fragment_data, |
187 | unsigned int fragment_len, | 187 | unsigned int fragment_len, |
188 | const struct ieee80211_tx_info *info, | 188 | struct ieee80211_tx_info *info, |
189 | u16 cookie) | 189 | u16 cookie) |
190 | { | 190 | { |
191 | struct b43_txhdr *txhdr = (struct b43_txhdr *)_txhdr; | 191 | struct b43_txhdr *txhdr = (struct b43_txhdr *)_txhdr; |
@@ -202,6 +202,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, | |||
202 | u16 phy_ctl = 0; | 202 | u16 phy_ctl = 0; |
203 | u8 extra_ft = 0; | 203 | u8 extra_ft = 0; |
204 | struct ieee80211_rate *txrate; | 204 | struct ieee80211_rate *txrate; |
205 | struct ieee80211_tx_rate *rates; | ||
205 | 206 | ||
206 | memset(txhdr, 0, sizeof(*txhdr)); | 207 | memset(txhdr, 0, sizeof(*txhdr)); |
207 | 208 | ||
@@ -291,7 +292,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, | |||
291 | phy_ctl |= B43_TXH_PHY_ENC_OFDM; | 292 | phy_ctl |= B43_TXH_PHY_ENC_OFDM; |
292 | else | 293 | else |
293 | phy_ctl |= B43_TXH_PHY_ENC_CCK; | 294 | phy_ctl |= B43_TXH_PHY_ENC_CCK; |
294 | if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) | 295 | if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) |
295 | phy_ctl |= B43_TXH_PHY_SHORTPRMBL; | 296 | phy_ctl |= B43_TXH_PHY_SHORTPRMBL; |
296 | 297 | ||
297 | switch (b43_ieee80211_antenna_sanitize(dev, info->antenna_sel_tx)) { | 298 | switch (b43_ieee80211_antenna_sanitize(dev, info->antenna_sel_tx)) { |
@@ -314,6 +315,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, | |||
314 | B43_WARN_ON(1); | 315 | B43_WARN_ON(1); |
315 | } | 316 | } |
316 | 317 | ||
318 | rates = info->control.rates; | ||
317 | /* MAC control */ | 319 | /* MAC control */ |
318 | if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) | 320 | if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) |
319 | mac_ctl |= B43_TXH_MAC_ACK; | 321 | mac_ctl |= B43_TXH_MAC_ACK; |
@@ -324,12 +326,22 @@ int b43_generate_txhdr(struct b43_wldev *dev, | |||
324 | mac_ctl |= B43_TXH_MAC_STMSDU; | 326 | mac_ctl |= B43_TXH_MAC_STMSDU; |
325 | if (phy->type == B43_PHYTYPE_A) | 327 | if (phy->type == B43_PHYTYPE_A) |
326 | mac_ctl |= B43_TXH_MAC_5GHZ; | 328 | mac_ctl |= B43_TXH_MAC_5GHZ; |
327 | if (info->flags & IEEE80211_TX_CTL_LONG_RETRY_LIMIT) | 329 | |
330 | /* Overwrite rates[0].count to make the retry calculation | ||
331 | * in the tx status easier. need the actual retry limit to | ||
332 | * detect whether the fallback rate was used. | ||
333 | */ | ||
334 | if ((rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) || | ||
335 | (rates[0].count <= dev->wl->hw->conf.long_frame_max_tx_count)) { | ||
336 | rates[0].count = dev->wl->hw->conf.long_frame_max_tx_count; | ||
328 | mac_ctl |= B43_TXH_MAC_LONGFRAME; | 337 | mac_ctl |= B43_TXH_MAC_LONGFRAME; |
338 | } else { | ||
339 | rates[0].count = dev->wl->hw->conf.short_frame_max_tx_count; | ||
340 | } | ||
329 | 341 | ||
330 | /* Generate the RTS or CTS-to-self frame */ | 342 | /* Generate the RTS or CTS-to-self frame */ |
331 | if ((info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) || | 343 | if ((rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) || |
332 | (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT)) { | 344 | (rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT)) { |
333 | unsigned int len; | 345 | unsigned int len; |
334 | struct ieee80211_hdr *hdr; | 346 | struct ieee80211_hdr *hdr; |
335 | int rts_rate, rts_rate_fb; | 347 | int rts_rate, rts_rate_fb; |
@@ -344,7 +356,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, | |||
344 | rts_rate_fb = b43_calc_fallback_rate(rts_rate); | 356 | rts_rate_fb = b43_calc_fallback_rate(rts_rate); |
345 | rts_rate_fb_ofdm = b43_is_ofdm_rate(rts_rate_fb); | 357 | rts_rate_fb_ofdm = b43_is_ofdm_rate(rts_rate_fb); |
346 | 358 | ||
347 | if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) { | 359 | if (rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT) { |
348 | struct ieee80211_cts *cts; | 360 | struct ieee80211_cts *cts; |
349 | 361 | ||
350 | if (b43_is_old_txhdr_format(dev)) { | 362 | if (b43_is_old_txhdr_format(dev)) { |
@@ -687,10 +699,18 @@ void b43_handle_txstatus(struct b43_wldev *dev, | |||
687 | /* Fill out the mac80211 TXstatus report based on the b43-specific | 699 | /* Fill out the mac80211 TXstatus report based on the b43-specific |
688 | * txstatus report data. This returns a boolean whether the frame was | 700 | * txstatus report data. This returns a boolean whether the frame was |
689 | * successfully transmitted. */ | 701 | * successfully transmitted. */ |
690 | bool b43_fill_txstatus_report(struct ieee80211_tx_info *report, | 702 | bool b43_fill_txstatus_report(struct b43_wldev *dev, |
703 | struct ieee80211_tx_info *report, | ||
691 | const struct b43_txstatus *status) | 704 | const struct b43_txstatus *status) |
692 | { | 705 | { |
693 | bool frame_success = 1; | 706 | bool frame_success = 1; |
707 | int retry_limit; | ||
708 | |||
709 | /* preserve the confiured retry limit before clearing the status | ||
710 | * The xmit function has overwritten the rc's value with the actual | ||
711 | * retry limit done by the hardware */ | ||
712 | retry_limit = report->status.rates[0].count; | ||
713 | ieee80211_tx_info_clear_status(report); | ||
694 | 714 | ||
695 | if (status->acked) { | 715 | if (status->acked) { |
696 | /* The frame was ACKed. */ | 716 | /* The frame was ACKed. */ |
@@ -700,14 +720,32 @@ bool b43_fill_txstatus_report(struct ieee80211_tx_info *report, | |||
700 | if (!(report->flags & IEEE80211_TX_CTL_NO_ACK)) { | 720 | if (!(report->flags & IEEE80211_TX_CTL_NO_ACK)) { |
701 | /* ...but we expected an ACK. */ | 721 | /* ...but we expected an ACK. */ |
702 | frame_success = 0; | 722 | frame_success = 0; |
703 | report->status.excessive_retries = 1; | ||
704 | } | 723 | } |
705 | } | 724 | } |
706 | if (status->frame_count == 0) { | 725 | if (status->frame_count == 0) { |
707 | /* The frame was not transmitted at all. */ | 726 | /* The frame was not transmitted at all. */ |
708 | report->status.retry_count = 0; | 727 | report->status.rates[0].count = 0; |
709 | } else | 728 | } else if (status->rts_count > dev->wl->hw->conf.short_frame_max_tx_count) { |
710 | report->status.retry_count = status->frame_count - 1; | 729 | /* |
730 | * If the short retries (RTS, not data frame) have exceeded | ||
731 | * the limit, the hw will not have tried the selected rate, | ||
732 | * but will have used the fallback rate instead. | ||
733 | * Don't let the rate control count attempts for the selected | ||
734 | * rate in this case, otherwise the statistics will be off. | ||
735 | */ | ||
736 | report->status.rates[0].count = 0; | ||
737 | report->status.rates[1].count = status->frame_count; | ||
738 | } else { | ||
739 | if (status->frame_count > retry_limit) { | ||
740 | report->status.rates[0].count = retry_limit; | ||
741 | report->status.rates[1].count = status->frame_count - | ||
742 | retry_limit; | ||
743 | |||
744 | } else { | ||
745 | report->status.rates[0].count = status->frame_count; | ||
746 | report->status.rates[1].idx = -1; | ||
747 | } | ||
748 | } | ||
711 | 749 | ||
712 | return frame_success; | 750 | return frame_success; |
713 | } | 751 | } |