diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-14 09:19:53 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-16 22:38:08 +0200 |
| commit | 2430816b4e29fd9e6719ff46a4292d8f58565cff (patch) | |
| tree | 2112067e8dd3f2ecc72b7c1d11dbb8b9afdcbe81 /net/wireless/core.c | |
| parent | 2b9ccd4e4308272e5aec614b77c5385e7ec2ec90 (diff) | |
| download | kernel-common-2430816b4e29fd9e6719ff46a4292d8f58565cff.tar.gz kernel-common-2430816b4e29fd9e6719ff46a4292d8f58565cff.tar.bz2 kernel-common-2430816b4e29fd9e6719ff46a4292d8f58565cff.zip | |
cfg80211: fix interface down/disconnect state handling
When the interface goes down, there's no need to call
cfg80211_mlme_down() after __cfg80211_disconnect() as
the latter will call the former (if appropriate.)
Also, in __cfg80211_disconnect(), if the cfg80211 SME
isn't used, __cfg80211_disconnected() may still need
to be called (depending on the current state) so that
the SME state gets cleared.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 6c9f8005cac0..73405e00c800 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -870,7 +870,6 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev, #endif __cfg80211_disconnect(rdev, dev, WLAN_REASON_DEAUTH_LEAVING, true); - cfg80211_mlme_down(rdev, dev); wdev_unlock(wdev); break; case NL80211_IFTYPE_MESH_POINT: |