aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rate.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-03-23 14:10:22 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-03-27 20:13:15 -0400
commit2b874e83c970b45c328ab12239b066a43505454c (patch)
treee4924ed6989f01682ec50910361b0d621dae0be4 /net/mac80211/rate.h
parent4a48e2a484e5cf99da4795cf2d6916e057d533ad (diff)
downloadkernel_samsung_aries-2b874e83c970b45c328ab12239b066a43505454c.zip
kernel_samsung_aries-2b874e83c970b45c328ab12239b066a43505454c.tar.gz
kernel_samsung_aries-2b874e83c970b45c328ab12239b066a43505454c.tar.bz2
mac80211: rate control status only for controlled packets
This patch changes mac80211 to not notify the rate control algorithm's tx_status() method when reporting status for a packet that didn't go through the rate control algorithm's get_rate() method. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rate.h')
-rw-r--r--net/mac80211/rate.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index b9164c9..2ab5ad9 100644
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -44,8 +44,10 @@ static inline void rate_control_tx_status(struct ieee80211_local *local,
struct rate_control_ref *ref = local->rate_ctrl;
struct ieee80211_sta *ista = &sta->sta;
void *priv_sta = sta->rate_ctrl_priv;
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
+ if (likely(info->flags & IEEE80211_TX_INTFL_RCALGO))
+ ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
}