rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / net / wireless / sme.c

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index cf4be21236b8f7789a721e44b628aa07eac27645..b7b6ff8be553a10f7a0191ac04f09eeaff06463c 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -659,10 +659,8 @@ 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);
@@ -760,14 +758,10 @@ 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;
        }