diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:24:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:24:12 +0100 |
| commit | d00ab2fdd4dc4361c97777bc1fef7234329d4659 (patch) | |
| tree | b8d8f98c1af633bbc1570b4270b39727737beebf /net/mac80211/rate.h | |
| parent | 88f502fedba82eff252b6420e8b8328e4ae25c67 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| download | kernel-crypto-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.gz kernel-crypto-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.xz kernel-crypto-d00ab2fdd4dc4361c97777bc1fef7234329d4659.zip | |
Merge branch 'linus' into core/futexes
Diffstat (limited to 'net/mac80211/rate.h')
| -rw-r--r-- | net/mac80211/rate.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h index 928da625e28..2ab5ad9e71c 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); } @@ -62,6 +64,18 @@ static inline void rate_control_rate_init(struct sta_info *sta) ref->ops->rate_init(ref->priv, sband, ista, priv_sta); } +static inline void rate_control_rate_update(struct ieee80211_local *local, + struct ieee80211_supported_band *sband, + struct sta_info *sta, u32 changed) +{ + struct rate_control_ref *ref = local->rate_ctrl; + struct ieee80211_sta *ista = &sta->sta; + void *priv_sta = sta->rate_ctrl_priv; + + if (ref->ops->rate_update) + ref->ops->rate_update(ref->priv, sband, ista, + priv_sta, changed); +} static inline void *rate_control_alloc_sta(struct rate_control_ref *ref, struct ieee80211_sta *sta, |