diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-10-28 10:35:37 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-09 13:57:55 -0700 |
| commit | bd0ac3f403ed2340aed15423406aabfd57e59430 (patch) | |
| tree | deb50024dbf30e50cd0ee204466399097f8bd747 /net/wireless | |
| parent | e7c926ff4dd84044a83c918cf8af4f848221f37f (diff) | |
net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/sme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 60998fd57ba..bbbed736e5e 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -772,9 +772,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; } |