diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-10-28 10:35:37 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-08-10 15:48:07 -0400 |
| commit | 676a1a05c548c8d5b1bfafb087821febec71fc73 (patch) | |
| tree | 1831b3af6d88fe876df800a4d606e81545f98a96 /net | |
| parent | c392a06557cb7e9a86dd465fda0ec7bf090b0cc8 (diff) | |
net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'net')
| -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 121d780c1549..fc7db175a268 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; } |