[PATCH 2/8] wcn36xx: move is_joining to wcn36xx_vif struct

[Eugene Krasnikov]

is_joining must be located not in wcn36xx struct but in
vif struct.

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

diff --git a/main.c b/main.c
index e585ef1..e13c7ff 100644
--- a/main.c
+++ b/main.c
@@ -524,14 +524,14 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 			    bss_conf->bssid);
 
 		if (!is_zero_ether_addr(bss_conf->bssid)) {
-			wcn->is_joining = true;
+			vif_priv->is_joining = true;
 			vif_priv->bss_index = 0xff;
 			wcn36xx_smd_join(wcn, bss_conf->bssid,
 					 vif->addr, WCN36XX_HW_CHANNEL(wcn));
 			wcn36xx_smd_config_bss(wcn, vif, NULL,
 					       bss_conf->bssid, false);
 		} else {
-			wcn->is_joining = false;
+			vif_priv->is_joining = false;
 			wcn36xx_smd_delete_bss(wcn, vif);
 		}
 	}
@@ -547,7 +547,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 	}
 
 	if (changed & BSS_CHANGED_ASSOC) {
-		wcn->is_joining = false;
+		vif_priv->is_joining = false;
 		if (bss_conf->assoc) {
 			struct ieee80211_sta *sta;
 			struct wcn36xx_sta *sta_priv;
diff --git a/txrx.c b/txrx.c
index f49ec20..309e26d 100644
--- a/txrx.c
+++ b/txrx.c
@@ -160,7 +160,7 @@ static void wcn36xx_set_tx_mgmt(struct wcn36xx_tx_bd *bd,
 	 * In joining state trick hardware that probe is sent as
 	 * unicast even if address is broadcast.
 	 */
-	if (wcn->is_joining &&
+	if (wcn->current_vif->is_joining &&
 	    ieee80211_is_probe_req(hdr->frame_control))
 		bcast = false;
 
diff --git a/wcn36xx.h b/wcn36xx.h
index 53dee3e..4cabfa8 100644
--- a/wcn36xx.h
+++ b/wcn36xx.h
@@ -118,6 +118,7 @@ struct wcn36xx_vif {
 	struct wcn36xx_sta *sta;
 	u8 dtim_period;
 	enum ani_ed_type encrypt_type;
+	bool is_joining;
 	u8 bss_index;
 	u8 ucast_dpu_signature;
 	/* Returned from WCN36XX_HAL_ADD_STA_SELF_RSP */
@@ -197,8 +198,6 @@ struct wcn36xx {
 	struct mutex		hal_ind_mutex;
 	struct list_head	hal_ind_queue;
 
-	bool			is_joining;
-
 	/* DXE channels */
 	struct wcn36xx_dxe_ch	dxe_tx_l_ch;	/* TX low */
 	struct wcn36xx_dxe_ch	dxe_tx_h_ch;	/* TX high */
-- 
1.8.2.2