Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63558a65 authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: minstrel_ht: switch to .tx_status_noskb 



Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent fb7acfb8

net/mac80211/rc80211_minstrel_ht.c

+4 −4
Original line number Diff line number Diff line
@@ -709,11 +709,10 @@ minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb) 
static void

minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,

                      struct ieee80211_sta *sta, void *priv_sta,

                      struct sk_buff *skb)

                      struct ieee80211_tx_info *info)

{

	struct minstrel_ht_sta_priv *msp = priv_sta;

	struct minstrel_ht_sta *mi = &msp->ht;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_rate *ar = info->status.rates;

	struct minstrel_rate_stats *rate, *rate2;

	struct minstrel_priv *mp = priv;
@@ -721,7 +720,8 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband, 
	int i;



	if (!msp->is_ht)

		return mac80211_minstrel.tx_status(priv, sband, sta, &msp->legacy, skb);

		return mac80211_minstrel.tx_status_noskb(priv, sband, sta,

							 &msp->legacy, info);



	/* This packet was aggregated but doesn't carry status info */

	if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
@@ -1343,7 +1343,7 @@ static u32 minstrel_ht_get_expected_throughput(void *priv_sta) 


static const struct rate_control_ops mac80211_minstrel_ht = {

	.name = "minstrel_ht",

	.tx_status = minstrel_ht_tx_status,

	.tx_status_noskb = minstrel_ht_tx_status,

	.get_rate = minstrel_ht_get_rate,

	.rate_init = minstrel_ht_rate_init,

	.rate_update = minstrel_ht_rate_update,