1 files changed, 12 insertions, 3 deletions

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 8020b5b094d4..544558171787 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -264,7 +264,7 @@ static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev)
                                wdev->conn->params.bssid,
                                wdev->conn->params.ssid,
                                wdev->conn->params.ssid_len,
-                               IEEE80211_BSS_TYPE_ESS,
+                               wdev->conn_bss_type,
                                IEEE80211_PRIVACY(wdev->conn->params.privacy));
         if (!bss)
                 return NULL;
@@ -687,7 +687,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
                 WARN_ON_ONCE(!wiphy_to_rdev(wdev->wiphy)->ops->connect);
                 bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
                                        wdev->ssid, wdev->ssid_len,
-                                       IEEE80211_BSS_TYPE_ESS,
+                                       wdev->conn_bss_type,
                                        IEEE80211_PRIVACY_ANY);
                 if (bss)
                         cfg80211_hold_bss(bss_from_pub(bss));
@@ -846,7 +846,7 @@ void cfg80211_roamed(struct net_device *dev,
 
         bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, wdev->ssid,
                                wdev->ssid_len,
-                               IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY);
+                               wdev->conn_bss_type, IEEE80211_PRIVACY_ANY);
         if (WARN_ON(!bss))
                 return;
 
@@ -917,6 +917,12 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
 
         nl80211_send_disconnected(rdev, dev, reason, ie, ie_len, from_ap);
 
+        /* stop critical protocol if supported */
+        if (rdev->ops->crit_proto_stop && rdev->crit_proto_nlportid) {
+                rdev->crit_proto_nlportid = 0;
+                rdev_crit_proto_stop(rdev, wdev);
+        }
+
         /*
          * Delete all the keys ... pairwise keys can't really
          * exist any more anyway, but default keys might.
@@ -1017,6 +1023,9 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
         memcpy(wdev->ssid, connect->ssid, connect->ssid_len);
         wdev->ssid_len = connect->ssid_len;
 
+        wdev->conn_bss_type = connect->pbss ? IEEE80211_BSS_TYPE_PBSS :
+                                              IEEE80211_BSS_TYPE_ESS;
+
         if (!rdev->ops->connect)
                 err = cfg80211_sme_connect(wdev, connect, prev_bssid);
         else