diff options
| author | Eliad Peller <eliad@wizery.com> | 2012-09-04 17:44:45 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 10:30:07 -0700 |
| commit | ba41a6df9e32ee5752165496017cadf700c14ca9 (patch) | |
| tree | 4907a445243d0ccd97e903e169b4f04c72e52509 /net/mac80211 | |
| parent | 0bf2a827d745808dde90001134ecc6a4af39b361 (diff) | |
| download | linux-3.10-ba41a6df9e32ee5752165496017cadf700c14ca9.tar.gz linux-3.10-ba41a6df9e32ee5752165496017cadf700c14ca9.tar.bz2 linux-3.10-ba41a6df9e32ee5752165496017cadf700c14ca9.zip | |
mac80211: clear bssid on auth/assoc failure
commit 3d2abdfdf14f4d6decc2023708211e19b096f4ca upstream.
ifmgd->bssid wasn't cleared properly in some
auth/assoc failure cases, causing mac80211 and
the low-level driver to go out of sync.
Clear ifmgd->bssid on failure, and notify the driver.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 25be6831ff0..abc31d7bd2a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3232,6 +3232,8 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, goto out_unlock; err_clear: + memset(ifmgd->bssid, 0, ETH_ALEN); + ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); ifmgd->auth_data = NULL; err_free: kfree(auth_data); @@ -3410,6 +3412,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, err = 0; goto out; err_clear: + memset(ifmgd->bssid, 0, ETH_ALEN); + ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); ifmgd->assoc_data = NULL; err_free: kfree(assoc_data); |