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

Commit 18fb84d9 authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: make rate control tx status API more extensible 



Rename .tx_status_noskb to .tx_status_ext and pass a new on-stack
struct ieee80211_tx_status instead of struct ieee80211_tx_info.

This struct can be used to pass extra information, e.g. for dynamic tx
power control

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

include/net/mac80211.h

+16 −4
Original line number Diff line number Diff line
@@ -948,6 +948,19 @@ struct ieee80211_tx_info { 
	};

};



/**

 * struct ieee80211_tx_status - extended tx staus info for rate control

 *

 * @sta: Station that the packet was transmitted for

 * @info: Basic tx status information

 * @skb: Packet skb (can be NULL if not provided by the driver)

 */

struct ieee80211_tx_status {

	struct ieee80211_sta *sta;

	struct ieee80211_tx_info *info;

	struct sk_buff *skb;

};



/**

 * struct ieee80211_scan_ies - descriptors for different blocks of IEs

 *
@@ -5471,10 +5484,9 @@ struct rate_control_ops { 
	void (*free_sta)(void *priv, struct ieee80211_sta *sta,

			 void *priv_sta);



	void (*tx_status_noskb)(void *priv,

	void (*tx_status_ext)(void *priv,

			      struct ieee80211_supported_band *sband,

				struct ieee80211_sta *sta, void *priv_sta,

				struct ieee80211_tx_info *info);

			      void *priv_sta, struct ieee80211_tx_status *st);

	void (*tx_status)(void *priv, struct ieee80211_supported_band *sband,

			  struct ieee80211_sta *sta, void *priv_sta,

			  struct sk_buff *skb);

net/mac80211/rate.c

+22 −0
Original line number Diff line number Diff line
@@ -62,6 +62,28 @@ void rate_control_rate_init(struct sta_info *sta) 
	set_sta_flag(sta, WLAN_STA_RATE_CONTROL);

}



void rate_control_tx_status(struct ieee80211_local *local,

			    struct ieee80211_supported_band *sband,

			    struct ieee80211_tx_status *st)

{

	struct rate_control_ref *ref = local->rate_ctrl;

	struct sta_info *sta = container_of(st->sta, struct sta_info, sta);

	void *priv_sta = sta->rate_ctrl_priv;



	if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))

		return;



	spin_lock_bh(&sta->rate_ctrl_lock);

	if (ref->ops->tx_status_ext)

		ref->ops->tx_status_ext(ref->priv, sband, priv_sta, st);

	else if (st->skb)

		ref->ops->tx_status(ref->priv, sband, st->sta, priv_sta, st->skb);

	else

		WARN_ON_ONCE(1);



	spin_unlock_bh(&sta->rate_ctrl_lock);

}



void rate_control_rate_update(struct ieee80211_local *local,

				    struct ieee80211_supported_band *sband,

				    struct sta_info *sta, u32 changed)

net/mac80211/rate.h

+3 −41
Original line number Diff line number Diff line
@@ -28,47 +28,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, 
			   struct sta_info *sta,

			   struct ieee80211_tx_rate_control *txrc);



static inline void rate_control_tx_status(struct ieee80211_local *local,

void rate_control_tx_status(struct ieee80211_local *local,

			    struct ieee80211_supported_band *sband,

					  struct sta_info *sta,

					  struct sk_buff *skb)

{

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



	if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))

		return;



	spin_lock_bh(&sta->rate_ctrl_lock);

	if (ref->ops->tx_status)

		ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);

	else

		ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info);

	spin_unlock_bh(&sta->rate_ctrl_lock);

}



static inline void

rate_control_tx_status_noskb(struct ieee80211_local *local,

			     struct ieee80211_supported_band *sband,

			     struct sta_info *sta,

			     struct ieee80211_tx_info *info)

{

	struct rate_control_ref *ref = local->rate_ctrl;

	struct ieee80211_sta *ista = &sta->sta;

	void *priv_sta = sta->rate_ctrl_priv;



	if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))

		return;



	if (WARN_ON_ONCE(!ref->ops->tx_status_noskb))

		return;



	spin_lock_bh(&sta->rate_ctrl_lock);

	ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info);

	spin_unlock_bh(&sta->rate_ctrl_lock);

}

			    struct ieee80211_tx_status *st);



void rate_control_rate_init(struct sta_info *sta);

void rate_control_rate_update(struct ieee80211_local *local,

net/mac80211/rc80211_minstrel.c

+3 −3
Original line number Diff line number Diff line
@@ -264,9 +264,9 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi) 


static void

minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,

		   struct ieee80211_sta *sta, void *priv_sta,

		   struct ieee80211_tx_info *info)

		   void *priv_sta, struct ieee80211_tx_status *st)

{

	struct ieee80211_tx_info *info = st->info;

	struct minstrel_priv *mp = priv;

	struct minstrel_sta_info *mi = priv_sta;

	struct ieee80211_tx_rate *ar = info->status.rates;
@@ -726,7 +726,7 @@ static u32 minstrel_get_expected_throughput(void *priv_sta) 


const struct rate_control_ops mac80211_minstrel = {

	.name = "minstrel",

	.tx_status_noskb = minstrel_tx_status,

	.tx_status_ext = minstrel_tx_status,

	.get_rate = minstrel_get_rate,

	.rate_init = minstrel_rate_init,

	.alloc = minstrel_alloc,

net/mac80211/rc80211_minstrel_ht.c

+5 −5
Original line number Diff line number Diff line
@@ -678,9 +678,9 @@ 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 ieee80211_tx_info *info)

                      void *priv_sta, struct ieee80211_tx_status *st)

{

	struct ieee80211_tx_info *info = st->info;

	struct minstrel_ht_sta_priv *msp = priv_sta;

	struct minstrel_ht_sta *mi = &msp->ht;

	struct ieee80211_tx_rate *ar = info->status.rates;
@@ -690,8 +690,8 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband, 
	int i;



	if (!msp->is_ht)

		return mac80211_minstrel.tx_status_noskb(priv, sband, sta,

							 &msp->legacy, info);

		return mac80211_minstrel.tx_status_ext(priv, sband,

						       &msp->legacy, st);



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

	if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
@@ -1374,7 +1374,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_noskb = minstrel_ht_tx_status,

	.tx_status_ext = minstrel_ht_tx_status,

	.get_rate = minstrel_ht_get_rate,

	.rate_init = minstrel_ht_rate_init,

	.rate_update = minstrel_ht_rate_update,