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)
committerDmitry Shmidt <dimitrysh@google.com>
Fri, 28 Oct 2011 17:35:37 +0000 (10:35 -0700)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net/wireless/sme.c

index 81e6747003914ce73c3896078cfba0774ea55691..cf4be21236b8f7789a721e44b628aa07eac27645 100644 (file)
@@ -763,9 +763,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;
        }