cfg80211: fix interface down/disconnect state handling
authorJohannes Berg <johannes.berg@intel.com>
Tue, 14 May 2013 07:19:53 +0000 (09:19 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 16 May 2013 20:38:08 +0000 (22:38 +0200)
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>
net/wireless/core.c
net/wireless/sme.c

Simple merge
Simple merge