diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-10-28 10:35:37 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:39:16 -0800 |
| commit | 9aa0ac544cbf4b5ba8b2695c404e56a4a6d533dc (patch) | |
| tree | 2eec21139d1a08ddf60331d5b3558cebf0a5be18 /net | |
| parent | f4b5d78d60082b49879fceb6d3a7cb4b75e7c60b (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 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; } |