diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-10-28 10:35:37 -0700 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-11-05 11:45:18 -0800 |
| commit | ebf64dfd664d3ca3a41390fa37f9b8e2f56f7861 (patch) | |
| tree | 9da588e3dc32dfc7c3943084256cc2d14675fda7 | |
| parent | 0c120165871bd0fe723e8e1e86efb7c03aa22aa1 (diff) | |
net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -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; } |