aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-11-19 14:08:10 -0500
committerJohannes Berg <johannes.berg@intel.com>2014-11-28 09:01:50 -0500
commit63558a650aabb43470549b4ad323d1cecd2da708 (patch)
tree14223e090a133e6dea6acdc4625896bba930996b /net/mac80211
parentfb7acfb8e1b39e8b8d0bccf1c5680bffcd4e2f9f (diff)
mac80211: minstrel_ht: switch to .tx_status_noskb
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rc80211_minstrel_ht.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index 2641dc8aac13..b52996aca4f1 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -709,11 +709,10 @@ minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb)
709static void 709static void
710minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband, 710minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
711 struct ieee80211_sta *sta, void *priv_sta, 711 struct ieee80211_sta *sta, void *priv_sta,
712 struct sk_buff *skb) 712 struct ieee80211_tx_info *info)
713{ 713{
714 struct minstrel_ht_sta_priv *msp = priv_sta; 714 struct minstrel_ht_sta_priv *msp = priv_sta;
715 struct minstrel_ht_sta *mi = &msp->ht; 715 struct minstrel_ht_sta *mi = &msp->ht;
716 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
717 struct ieee80211_tx_rate *ar = info->status.rates; 716 struct ieee80211_tx_rate *ar = info->status.rates;
718 struct minstrel_rate_stats *rate, *rate2; 717 struct minstrel_rate_stats *rate, *rate2;
719 struct minstrel_priv *mp = priv; 718 struct minstrel_priv *mp = priv;
@@ -721,7 +720,8 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
721 int i; 720 int i;
722 721
723 if (!msp->is_ht) 722 if (!msp->is_ht)
724 return mac80211_minstrel.tx_status(priv, sband, sta, &msp->legacy, skb); 723 return mac80211_minstrel.tx_status_noskb(priv, sband, sta,
724 &msp->legacy, info);
725 725
726 /* This packet was aggregated but doesn't carry status info */ 726 /* This packet was aggregated but doesn't carry status info */
727 if ((info->flags & IEEE80211_TX_CTL_AMPDU) && 727 if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
@@ -1343,7 +1343,7 @@ static u32 minstrel_ht_get_expected_throughput(void *priv_sta)
1343 1343
1344static const struct rate_control_ops mac80211_minstrel_ht = { 1344static const struct rate_control_ops mac80211_minstrel_ht = {
1345 .name = "minstrel_ht", 1345 .name = "minstrel_ht",
1346 .tx_status = minstrel_ht_tx_status, 1346 .tx_status_noskb = minstrel_ht_tx_status,
1347 .get_rate = minstrel_ht_get_rate, 1347 .get_rate = minstrel_ht_get_rate,
1348 .rate_init = minstrel_ht_rate_init, 1348 .rate_init = minstrel_ht_rate_init,
1349 .rate_update = minstrel_ht_rate_update, 1349 .rate_update = minstrel_ht_rate_update,