commit 9f135b3d8d6152a19000e637844cc41cda6c5335
author Dmitry Shmidt <dimitrysh@google.com> Fri Oct 28 10:35:37 2011 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Fri Oct 28 10:35:37 2011 -0700
tree 8c1a67638ffd8def2e99135682ff3545553ebac3
parent 2bb3e310159b65c88caf0c67a20ed257568be267

net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net/wireless/sme.c

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 81e6747..cf4be21 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -763,9 +763,11 @@
 #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;
 	}