nl80211: Store ssid on successful associationnl80211-ssid-association

1 files changed, 6 insertions, 0 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ab62d305b48b..a784157a171e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7293,6 +7293,10 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
 		wdev_lock(dev->ieee80211_ptr);
 		err = cfg80211_mlme_assoc(rdev, dev, chan, bssid,
 					  ssid, ssid_len, &req);
+		if (!err) {
+			dev->ieee80211_ptr->ssid_len = ssid_len;
+			memcpy(dev->ieee80211_ptr->ssid, ssid, ssid_len);
+		}
 		wdev_unlock(dev->ieee80211_ptr);
 	}
 
@@ -7389,6 +7393,8 @@ static int nl80211_disassociate(struct sk_buff *skb, struct genl_info *info)
 	wdev_lock(dev->ieee80211_ptr);
 	err = cfg80211_mlme_disassoc(rdev, dev, bssid, ie, ie_len, reason_code,
 				     local_state_change);
+	if (!err)
+		dev->ieee80211_ptr->ssid_len = 0;
 	wdev_unlock(dev->ieee80211_ptr);
 	return err;
 }