diff options
Diffstat (limited to 'net/mac80211/rc80211_minstrel.c')
-rw-r--r-- | net/mac80211/rc80211_minstrel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c index c2b91bf47f6d..d51f6b1c549b 100644 --- a/net/mac80211/rc80211_minstrel.c +++ b/net/mac80211/rc80211_minstrel.c | |||
@@ -223,11 +223,10 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi) | |||
223 | static void | 223 | static void |
224 | minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband, | 224 | minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband, |
225 | struct ieee80211_sta *sta, void *priv_sta, | 225 | struct ieee80211_sta *sta, void *priv_sta, |
226 | struct sk_buff *skb) | 226 | struct ieee80211_tx_info *info) |
227 | { | 227 | { |
228 | struct minstrel_priv *mp = priv; | 228 | struct minstrel_priv *mp = priv; |
229 | struct minstrel_sta_info *mi = priv_sta; | 229 | struct minstrel_sta_info *mi = priv_sta; |
230 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | ||
231 | struct ieee80211_tx_rate *ar = info->status.rates; | 230 | struct ieee80211_tx_rate *ar = info->status.rates; |
232 | int i, ndx; | 231 | int i, ndx; |
233 | int success; | 232 | int success; |
@@ -674,7 +673,7 @@ static u32 minstrel_get_expected_throughput(void *priv_sta) | |||
674 | 673 | ||
675 | const struct rate_control_ops mac80211_minstrel = { | 674 | const struct rate_control_ops mac80211_minstrel = { |
676 | .name = "minstrel", | 675 | .name = "minstrel", |
677 | .tx_status = minstrel_tx_status, | 676 | .tx_status_noskb = minstrel_tx_status, |
678 | .get_rate = minstrel_get_rate, | 677 | .get_rate = minstrel_get_rate, |
679 | .rate_init = minstrel_rate_init, | 678 | .rate_init = minstrel_rate_init, |
680 | .alloc = minstrel_alloc, | 679 | .alloc = minstrel_alloc, |