diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-02-17 22:00:57 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-02-17 22:00:57 +0400 |
| commit | 8393ea14076dbda27010fcabcff5e2d40f0bfb1f (patch) | |
| tree | a980405258207f6a0d0edfc78ae07fb652bf54e1 /net/wireless/sme.c | |
| parent | 49561d58a14351d136518f25bd686f9a6ca41b69 (diff) | |
| parent | 1a20977eb1ba05d3e1a20f1e81a830a876fdb054 (diff) | |
Merge branch 'linaro-android-3.3-agreen-rebase' into linaro-android
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 7b9ecaed96b..4f57761c18f 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -688,8 +688,10 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie, wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) return; +#ifndef CONFIG_CFG80211_ALLOW_RECONNECT if (wdev->sme_state != CFG80211_SME_CONNECTED) return; +#endif if (wdev->current_bss) { cfg80211_unhold_bss(wdev->current_bss); @@ -787,10 +789,14 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev, ASSERT_WDEV_LOCK(wdev); +#ifndef CONFIG_CFG80211_ALLOW_RECONNECT if (wdev->sme_state != CFG80211_SME_IDLE) return -EALREADY; if (WARN_ON(wdev->connect_keys)) { +#else + if (wdev->connect_keys) { +#endif kfree(wdev->connect_keys); wdev->connect_keys = NULL; } |