diff options
| author | Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> | 2012-05-30 11:39:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-17 11:21:25 -0700 |
| commit | 721632c39add11e5d5fa5dd8b956dcae63d02b17 (patch) | |
| tree | d08b6f48769a2c944ecb82eb580703de0a4ec813 /net | |
| parent | f4c3d440c898725132291e5171b3244c2027c30e (diff) | |
| download | linux-3.10-721632c39add11e5d5fa5dd8b956dcae63d02b17.tar.gz linux-3.10-721632c39add11e5d5fa5dd8b956dcae63d02b17.tar.bz2 linux-3.10-721632c39add11e5d5fa5dd8b956dcae63d02b17.zip | |
mac80211: fix error in station state transitions during reconfig
commit bd34ab62a3297bd7685da11b0cbe05ae4cd8b02c upstream.
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.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 3862c966dec..eb9d7c0529b 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1224,7 +1224,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)); } |