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

Commit 2b874e83 authored Mar 23, 2009 by Johannes Berg Committed by John W. Linville Mar 27, 2009

mac80211: rate control status only for controlled packets

This patch changes mac80211 to not notify the rate control algorithm's
tx_status() method when reporting status for a packet that didn't go
through the rate control algorithm's get_rate() method.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 4a48e2a4

include/net/mac80211.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -245,6 +245,9 @@ struct ieee80211_bss_conf {
	* @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be		* @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be
	* set by rate control algorithms to indicate probe rate, will		* set by rate control algorithms to indicate probe rate, will
	* be cleared for fragmented frames (except on the last fragment)		* be cleared for fragmented frames (except on the last fragment)
			* @IEEE80211_TX_INTFL_RCALGO: mac80211 internal flag, do not test or
			* set this flag in the driver; indicates that the rate control
			* algorithm was used and should be notified of TX status
	*/		*/
	enum mac80211_tx_control_flags {		enum mac80211_tx_control_flags {
	IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0),		IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0),
	@@ -260,6 +263,7 @@ enum mac80211_tx_control_flags {
	IEEE80211_TX_STAT_AMPDU = BIT(10),		IEEE80211_TX_STAT_AMPDU = BIT(10),
	IEEE80211_TX_STAT_AMPDU_NO_BACK = BIT(11),		IEEE80211_TX_STAT_AMPDU_NO_BACK = BIT(11),
	IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(12),		IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(12),
			IEEE80211_TX_INTFL_RCALGO = BIT(13),
	};		};

	/**		/**

net/mac80211/rate.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -219,10 +219,12 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
	info->control.rates[i].count = 1;		info->control.rates[i].count = 1;
	}		}

	if (sta && sdata->force_unicast_rateidx > -1)		if (sta && sdata->force_unicast_rateidx > -1) {
	info->control.rates[0].idx = sdata->force_unicast_rateidx;		info->control.rates[0].idx = sdata->force_unicast_rateidx;
	else		} else {
	ref->ops->get_rate(ref->priv, ista, priv_sta, txrc);		ref->ops->get_rate(ref->priv, ista, priv_sta, txrc);
			info->flags \|= IEEE80211_TX_INTFL_RCALGO;
			}

	/*		/*
	* try to enforce the maximum rate the user wanted		* try to enforce the maximum rate the user wanted

net/mac80211/rate.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,9 @@ static inline void rate_control_tx_status(struct ieee80211_local *local,
	struct rate_control_ref *ref = local->rate_ctrl;		struct rate_control_ref *ref = local->rate_ctrl;
	struct ieee80211_sta *ista = &sta->sta;		struct ieee80211_sta *ista = &sta->sta;
	void *priv_sta = sta->rate_ctrl_priv;		void *priv_sta = sta->rate_ctrl_priv;
			struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

			if (likely(info->flags & IEEE80211_TX_INTFL_RCALGO))
	ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);		ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
	}		}