Commit 0c869808 authored Apr 22, 2010 by Juuso Oikarinen Committed by John W. Linville Apr 26, 2010

mac80211: Fix sta->last_tx_rate setting with no-op rate control devices

The sta->last_tx_rate is traditionally updated just before transmitting a
frame based on information from the rate control algorithm. However, for
hardware drivers with IEEE80211_HW_HAS_RATE_CONTROL this is not performed,
as the rate control algorithm is not executed, and because the used rate is
not known before the frame has actually been transmitted.

This causes atleast a fixed 1Mb/s to be reported to user space. A few other
instances of code also rely on this information.

Fix this by setting the sta->last_tx_rate in tx_status handling. There, look
for last rates entry set by the driver, and use that as value for
sta->last_tx_rate.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 5af55428

net/mac80211/status.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ void ieee80211_tx_status(struct ieee80211_hw hw, struct sk_buff skb)
		struct net_device *prev_dev = NULL;
		struct sta_info sta, tmp;
		int retry_count = -1, i;
		int rates_idx = -1;
		bool send_to_cooked;

		for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
		@@ -178,6 +179,8 @@ void ieee80211_tx_status(struct ieee80211_hw hw, struct sk_buff skb)
		if (i >= hw->max_rates) {
		info->status.rates[i].idx = -1;
		info->status.rates[i].count = 0;
		} else if (info->status.rates[i].idx >= 0) {
		rates_idx = i;
		}

		retry_count += info->status.rates[i].count;
		@@ -206,6 +209,10 @@ void ieee80211_tx_status(struct ieee80211_hw hw, struct sk_buff skb)
		return;
		}

		if ((local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) &&
		(rates_idx != -1))
		sta->last_tx_rate = info->status.rates[rates_idx];

		if ((info->flags & IEEE80211_TX_STAT_AMPDU_NO_BACK) &&
		(ieee80211_is_data_qos(fc))) {
		u16 tid, ssn;

Admin message