diff options
Diffstat (limited to 'net/mac80211/rc80211_pid_algo.c')
-rw-r--r-- | net/mac80211/rc80211_pid_algo.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c index 549607703bd8..8c053be9dc24 100644 --- a/net/mac80211/rc80211_pid_algo.c +++ b/net/mac80211/rc80211_pid_algo.c | |||
@@ -276,11 +276,9 @@ rate_control_pid_get_rate(void *priv, struct ieee80211_sta *sta, | |||
276 | { | 276 | { |
277 | struct sk_buff *skb = txrc->skb; | 277 | struct sk_buff *skb = txrc->skb; |
278 | struct ieee80211_supported_band *sband = txrc->sband; | 278 | struct ieee80211_supported_band *sband = txrc->sband; |
279 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | ||
280 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 279 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
281 | struct rc_pid_sta_info *spinfo = priv_sta; | 280 | struct rc_pid_sta_info *spinfo = priv_sta; |
282 | int rateidx; | 281 | int rateidx; |
283 | __le16 fc; | ||
284 | 282 | ||
285 | if (txrc->rts) | 283 | if (txrc->rts) |
286 | info->control.rates[0].count = | 284 | info->control.rates[0].count = |
@@ -290,15 +288,8 @@ rate_control_pid_get_rate(void *priv, struct ieee80211_sta *sta, | |||
290 | txrc->hw->conf.short_frame_max_tx_count; | 288 | txrc->hw->conf.short_frame_max_tx_count; |
291 | 289 | ||
292 | /* Send management frames and NO_ACK data using lowest rate. */ | 290 | /* Send management frames and NO_ACK data using lowest rate. */ |
293 | fc = hdr->frame_control; | 291 | if (rate_control_send_low(sta, priv_sta, txrc)) |
294 | if (!sta || !spinfo || !ieee80211_is_data(fc) || | ||
295 | info->flags & IEEE80211_TX_CTL_NO_ACK) { | ||
296 | info->control.rates[0].idx = rate_lowest_index(sband, sta); | ||
297 | if (info->flags & IEEE80211_TX_CTL_NO_ACK) | ||
298 | info->control.rates[0].count = 1; | ||
299 | |||
300 | return; | 292 | return; |
301 | } | ||
302 | 293 | ||
303 | rateidx = spinfo->txrate_idx; | 294 | rateidx = spinfo->txrate_idx; |
304 | 295 | ||