Commit 0183826b authored Dec 17, 2009 by Johannes Berg Committed by John W. Linville Dec 21, 2009

mac80211: fix WMM AP settings application



My
  commit 77fdaa12
  Author: Johannes Berg <johannes@sipsolutions.net>
  Date:   Tue Jul 7 03:45:17 2009 +0200

      mac80211: rework MLME for multiple authentications

inadvertedly broke WMM because it removed, along with
a bunch of other now useless initialisations, the line
initialising sdata->u.mgd.wmm_last_param_set to -1
which would make it adopt any WMM parameter set. If,
as is usually the case, the AP uses WMM parameter set
sequence number zero, we'd never update it until the
AP changes the sequence number.

Add the missing initialisation back to get the WMM
settings from the AP applied locally.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: stable@kernel.org [2.6.31+]
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 9a418af5

net/mac80211/mlme.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -915,6 +915,14 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
		sdata->u.mgd.flags &= ~(IEEE80211_STA_CONNECTION_POLL \|
		IEEE80211_STA_BEACON_POLL);

		/*
		* Always handle WMM once after association regardless
		* of the first value the AP uses. Setting -1 here has
		* that effect because the AP values is an unsigned
		* 4-bit value.
		*/
		sdata->u.mgd.wmm_last_param_set = -1;

		ieee80211_led_assoc(local, 1);

		sdata->vif.bss_conf.assoc = 1;

Admin message