diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-10-28 10:35:37 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-07-01 13:40:34 -0700 |
| commit | a513dd43e6fea935bb5113fd13fd12e627dfeebb (patch) | |
| tree | d1e6bfb58670ac39a8205eb27eac58c2604b987e /net/wireless/sme.c | |
| parent | 5b485bf6b930ce59afde5fe45636691619c45afc (diff) | |
| download | olio-linux-3.10-a513dd43e6fea935bb5113fd13fd12e627dfeebb.tar.xz olio-linux-3.10-a513dd43e6fea935bb5113fd13fd12e627dfeebb.zip | |
net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'net/wireless/sme.c')
| -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 49ad81dfae5..e2f74e66a16 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -790,9 +790,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; } |