[PATCH 4/4] Get beacon_int, ht_operation_mode and hidden_ssid from vif

[Eugene Krasnikov]

Set correct config_bss parameters from vif

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

diff --git a/main.c b/main.c
index 3e926c5..89055cb 100644
--- a/main.c
+++ b/main.c
@@ -501,14 +501,6 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac bss info changed vif %p changed 0x%08x",
 		    vif, changed);
 
-	if (changed & BSS_CHANGED_BEACON_INT) {
-		wcn36xx_dbg(WCN36XX_DBG_MAC,
-			    "mac bss changed beacon_int %d",
-			    bss_conf->beacon_int);
-
-		wcn->beacon_interval = bss_conf->beacon_int;
-	}
-
 	if (changed & BSS_CHANGED_BEACON_INFO) {
 		wcn36xx_dbg(WCN36XX_DBG_MAC,
 			    "mac bss changed dtim period %d",
diff --git a/smd.c b/smd.c
index bc61e3f..b49167d 100644
--- a/smd.c
+++ b/smd.c
@@ -812,7 +812,7 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
 	bss->lln_non_gf_coexist = 0;
 	bss->lsig_tx_op_protection_full_support = 0;
 	bss->rifs_mode = 0;
-	bss->beacon_interval = wcn->beacon_interval;
+	bss->beacon_interval = vif->bss_conf.beacon_int;
 	bss->dtim_period = wcn->dtim_period;
 	bss->tx_channel_width_set = 0;
 	bss->oper_channel = WCN36XX_HW_CHANNEL(wcn);
@@ -855,10 +855,10 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
 	bss->ht = 0;
 	bss->obss_prot_enabled = 0;
 	bss->rmf = 0;
-	bss->ht_oper_mode = 0;
+	bss->ht_oper_mode = vif->bss_conf.ht_operation_mode;
 	bss->dual_cts_protection = 0;
 	bss->max_probe_resp_retry_limit = 0;
-	bss->hidden_ssid = 0;
+	bss->hidden_ssid = vif->bss_conf.hidden_ssid;
 	bss->proxy_probe_resp = 0;
 	bss->edca_params_valid = 0;
 
diff --git a/wcn36xx.h b/wcn36xx.h
index 743325e..8f64b3a 100644
--- a/wcn36xx.h
+++ b/wcn36xx.h
@@ -115,7 +115,6 @@ struct wcn36xx {
 	struct wcn36xx_hal_mac_ssid ssid;
 	u16			aid;
 	struct wcn36xx_vif	*current_vif;
-	u16			beacon_interval;
 	u8			dtim_period;
 	enum ani_ed_type	encrypt_type;
 
-- 
1.7.11.3