net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
authorDmitry Shmidt <dimitrysh@google.com>
Fri, 28 Oct 2011 17:35:37 +0000 (10:35 -0700)
committerArve Hjønnevåg <arve@android.com>
Mon, 1 Jul 2013 20:40:34 +0000 (13:40 -0700)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net/wireless/sme.c

index 49ad81dfae550489040b42fe537d062fcf1deb30..e2f74e66a1697e7fa4f10ac20a49b39e44848ebf 100644 (file)
@@ -790,9 +790,11 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
 #ifndef CONFIG_CFG80211_ALLOW_RECONNECT
        if (wdev->sme_state != CFG80211_SME_IDLE)
                return -EALREADY;
-#endif
 
        if (WARN_ON(wdev->connect_keys)) {
+#else
+       if (wdev->connect_keys) {
+#endif
                kfree(wdev->connect_keys);
                wdev->connect_keys = NULL;
        }