Skip to content

Commit 63558a6

Browse files
Felix Fietkaujmberg-intel
authored andcommitted
mac80211: minstrel_ht: switch to .tx_status_noskb
Signed-off-by: Felix Fietkau <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
1 parent fb7acfb commit 63558a6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

net/mac80211/rc80211_minstrel_ht.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -709,19 +709,19 @@ minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb)
709709
static void
710710
minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
711711
struct ieee80211_sta *sta, void *priv_sta,
712-
struct sk_buff *skb)
712+
struct ieee80211_tx_info *info)
713713
{
714714
struct minstrel_ht_sta_priv *msp = priv_sta;
715715
struct minstrel_ht_sta *mi = &msp->ht;
716-
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
717716
struct ieee80211_tx_rate *ar = info->status.rates;
718717
struct minstrel_rate_stats *rate, *rate2;
719718
struct minstrel_priv *mp = priv;
720719
bool last, update = false;
721720
int i;
722721

723722
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);
725725

726726
/* This packet was aggregated but doesn't carry status info */
727727
if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
@@ -1343,7 +1343,7 @@ static u32 minstrel_ht_get_expected_throughput(void *priv_sta)
13431343

13441344
static const struct rate_control_ops mac80211_minstrel_ht = {
13451345
.name = "minstrel_ht",
1346-
.tx_status = minstrel_ht_tx_status,
1346+
.tx_status_noskb = minstrel_ht_tx_status,
13471347
.get_rate = minstrel_ht_get_rate,
13481348
.rate_init = minstrel_ht_rate_init,
13491349
.rate_update = minstrel_ht_rate_update,

0 commit comments

Comments
 (0)