summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>2012-05-30 11:39:33 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-06-04 15:24:56 -0400
commitbd34ab62a3297bd7685da11b0cbe05ae4cd8b02c (patch)
tree626060c15a9147c1988a3df74b74859acd1deaf4 /net
parenta5fdde28b4f5fb756032e7ad2c6fcdcffde20958 (diff)
downloadlinux-stable-bd34ab62a3297bd7685da11b0cbe05ae4cd8b02c.tar.gz
linux-stable-bd34ab62a3297bd7685da11b0cbe05ae4cd8b02c.tar.bz2
linux-stable-bd34ab62a3297bd7685da11b0cbe05ae4cd8b02c.zip
mac80211: fix error in station state transitions during reconfig
As part of hardware reconfig mac80211 tries to restore the station state to its values before the hardware reconfig, but it only goes to the last-state - 1. Fix this off-by-one error. Cc: stable@kernel.org [3.4] Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index a44c6807df01..8dd4712620ff 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1271,7 +1271,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
enum ieee80211_sta_state state;
for (state = IEEE80211_STA_NOTEXIST;
- state < sta->sta_state - 1; state++)
+ state < sta->sta_state; state++)
WARN_ON(drv_sta_state(local, sta->sdata, sta,
state, state + 1));
}