1 files changed, 6 insertions, 0 deletions

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index b7b6ff8be55..cf4be21236b 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -659,8 +659,10 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
                     wdev->iftype != NL80211_IFTYPE_P2P_CLIENT))
                 return;
 
+#ifndef CONFIG_CFG80211_ALLOW_RECONNECT
         if (wdev->sme_state != CFG80211_SME_CONNECTED)
                 return;
+#endif
 
         if (wdev->current_bss) {
                 cfg80211_unhold_bss(wdev->current_bss);
@@ -758,10 +760,14 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
 
         ASSERT_WDEV_LOCK(wdev);
 
+#ifndef CONFIG_CFG80211_ALLOW_RECONNECT
         if (wdev->sme_state != CFG80211_SME_IDLE)
                 return -EALREADY;
 
         if (WARN_ON(wdev->connect_keys)) {
+#else
+        if (wdev->connect_keys) {
+#endif
                 kfree(wdev->connect_keys);
                 wdev->connect_keys = NULL;
         }