[PATCH 8/8] wcn36xx: move ssid to wcn36xx_priv struct

[Eugene Krasnikov]

Because this is where it should be.

Signed-off-by: Eugene Krasnikov <k.eugene.e at gmail.com>
---
 main.c    | 6 ++++--
 smd.c     | 4 ++--
 wcn36xx.h | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index 18ece1f..b8f9aa7 100644
--- a/main.c
+++ b/main.c
@@ -539,8 +539,10 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 		wcn36xx_dbg_dump(WCN36XX_DBG_MAC, "ssid ",
 				 bss_conf->ssid, bss_conf->ssid_len);
 
-		wcn->ssid.length = bss_conf->ssid_len;
-		memcpy(&wcn->ssid.ssid, bss_conf->ssid, bss_conf->ssid_len);
+		vif_priv->ssid.length = bss_conf->ssid_len;
+		memcpy(&vif_priv->ssid.ssid,
+		       bss_conf->ssid,
+		       bss_conf->ssid_len);
 	}
 
 	if (changed & BSS_CHANGED_ASSOC) {
diff --git a/smd.c b/smd.c
index 8092791..830179f 100644
--- a/smd.c
+++ b/smd.c
@@ -1170,8 +1170,8 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
 	wcn36xx_smd_set_sta_params(wcn, vif, sta, sta_params);
 
 	/* wcn->ssid is only valid in AP and IBSS mode */
-	bss->ssid.length = wcn->ssid.length;
-	memcpy(bss->ssid.ssid, wcn->ssid.ssid, wcn->ssid.length);
+	bss->ssid.length = vif_priv->ssid.length;
+	memcpy(bss->ssid.ssid, vif_priv->ssid.ssid, vif_priv->ssid.length);
 
 	bss->obss_prot_enabled = 0;
 	bss->rmf = 0;
diff --git a/wcn36xx.h b/wcn36xx.h
index e61f1b6..3e5a838 100644
--- a/wcn36xx.h
+++ b/wcn36xx.h
@@ -119,6 +119,7 @@ struct wcn36xx_vif {
 	u8 dtim_period;
 	enum ani_ed_type encrypt_type;
 	bool is_joining;
+	struct wcn36xx_hal_mac_ssid ssid;
 
 	/* Power management */
 	enum wcn36xx_power_state pw_state;
@@ -167,7 +168,6 @@ struct wcn36xx {
 	struct ieee80211_hw	*hw;
 	struct device		*dev;
 	struct mac_address	addresses;
-	struct wcn36xx_hal_mac_ssid ssid;
 	struct list_head	vif_list;
 
 	u8			fw_revision;
-- 
1.8.2.2