From 9aa0ac544cbf4b5ba8b2695c404e56a4a6d533dc Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Fri, 28 Oct 2011 10:35:37 -0700 Subject: net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT Signed-off-by: Dmitry Shmidt --- net/wireless/sme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'net/wireless') diff --git a/net/wireless/sme.c b/net/wireless/sme.c index b206cf606b02..c0fe1a8a6ee1 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -765,9 +765,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; } -- cgit v1.2.3