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

Commit e1936e94 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: call rate control only after init 



There are situations where we don't have the
necessary rate control information yet for
station entries, e.g. when associating. This
currently doesn't really happen due to the
dummy station handling; explicitly disabling
rate control when it's not initialised will
allow us to remove dummy stations.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1023f3bc

net/mac80211/debugfs_sta.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf, 
	test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""



	int res = scnprintf(buf, sizeof(buf),

			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",

			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",

			    TEST(AUTH), TEST(ASSOC), TEST(PS_STA),

			    TEST(PS_DRIVER), TEST(AUTHORIZED),

			    TEST(SHORT_PREAMBLE),
@@ -71,7 +71,7 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf, 
			    TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),

			    TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),

			    TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),

			    TEST(INSERTED));

			    TEST(INSERTED), TEST(RATE_CONTROL));

#undef TEST

	return simple_read_from_buffer(userbuf, count, ppos, buf, res);

}

net/mac80211/rate.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, 
	u32 mask;

	u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN];



	if (sta) {

	if (sta && test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) {

		ista = &sta->sta;

		priv_sta = sta->rate_ctrl_priv;

	}

net/mac80211/rate.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static inline void rate_control_rate_init(struct sta_info *sta) 
	sband = local->hw.wiphy->bands[local->hw.conf.channel->band];



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

	set_sta_flag(sta, WLAN_STA_RATE_CONTROL);

}



static inline void rate_control_rate_update(struct ieee80211_local *local,

net/mac80211/sta_info.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
 *	reply to other uAPSD trigger frames or PS-Poll.

 * @WLAN_STA_4ADDR_EVENT: 4-addr event was already sent for this frame.

 * @WLAN_STA_INSERTED: This station is inserted into the hash table.

 * @WLAN_STA_RATE_CONTROL: rate control was initialized for this station.

 */

enum ieee80211_sta_info_flags {

	WLAN_STA_AUTH,
@@ -73,6 +74,7 @@ enum ieee80211_sta_info_flags { 
	WLAN_STA_SP,

	WLAN_STA_4ADDR_EVENT,

	WLAN_STA_INSERTED,

	WLAN_STA_RATE_CONTROL,

};



#define STA_TID_NUM 16