[PATCH 10/13] smd: organise wcn36xx_smd_config_bss() better

[Kalle Valo]

Just to make it sure that all fields are set correctly follow the field order
from struct wcn36xx_hal_config_bss_params.

Signed-off-by: Kalle Valo <kvalo at qca.qualcomm.com>
---
 main.c |    2 -
 smd.c  |  186 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 145 insertions(+), 43 deletions(-)

diff --git a/main.c b/main.c
index 285159f..3049761 100644
--- a/main.c
+++ b/main.c
@@ -227,7 +227,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 			wcn->beacon_enable = true;
 			skb = ieee80211_beacon_get_tim(hw, vif, &tim_off, &tim_len);
 			wcn36xx_smd_config_bss(wcn, NL80211_IFTYPE_AP,
-					       NULL, false);
+					       wcn->addresses[0].addr, false);
 			wcn36xx_smd_send_beacon(wcn, skb, tim_off, 0);
 		} else {
 			/* FIXME: disable beaconing */
diff --git a/smd.c b/smd.c
index 1daa726..3540b20 100644
--- a/smd.c
+++ b/smd.c
@@ -16,6 +16,8 @@
 
 #include "smd.h"
 
+#include <linux/etherdevice.h>
+
 int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len)
 {
 	int avail;
@@ -591,62 +593,165 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, enum nl80211_iftype type,
 	bss = &msg.bss_params;
 	sta = &bss->sta;
 
+	WARN_ON(is_zero_ether_addr(bssid));
+
+	memcpy(&bss->bssid, bssid, ETH_ALEN);
+	memcpy(&bss->bssid, &wcn->addresses[0], ETH_ALEN);
+
+	memcpy(&bss->self_mac_addr, &wcn->addresses[0], ETH_ALEN);
+
 	if (type == NL80211_IFTYPE_STATION) {
-		memcpy(&bss->bssid, bssid, ETH_ALEN);
-		memcpy(&bss->self_mac_addr, &wcn->addresses[0], ETH_ALEN);
 		bss->bss_type = WCN36XX_HAL_INFRASTRUCTURE_MODE;
 
-		/*
-		 * 0 - AP, 1 - STA
-		 *
-		 * TODO define enum for oper_mode
-		 */
+		/* STA */
 		bss->oper_mode = 1;
 
-		bss->llg_coexist = 1;
-		bss->beacon_interval = 0x64;
+	} else if (type == NL80211_IFTYPE_AP) {
+		bss->bss_type = WCN36XX_HAL_INFRA_AP_MODE;
 
-		bss->oper_channel = wcn->ch;
-		memcpy(&sta->bssid, bssid, ETH_ALEN);
-		sta->type = 1;
-		sta->listen_interval = 0x64;
-		sta->wmm_enabled = 1;
+		/* AP */
+		bss->oper_mode = 0;
+	}
 
-		sta->max_ampdu_size = 3;
-		sta->max_ampdu_density = 5;
-		sta->dsss_cck_mode_40mhz = 1;
-	} else if (type == NL80211_IFTYPE_AP) {
-		memcpy(&bss->bssid, &wcn->addresses[0], ETH_ALEN);
-		memcpy(&bss->self_mac_addr, &wcn->addresses[0], ETH_ALEN);
+	bss->nw_type = WCN36XX_HAL_11G_NW_TYPE;
 
-		//TODO do all this configurabel
-		bss->bss_type = WCN36XX_HAL_INFRA_AP_MODE;
-		bss->oper_mode = 0; //0 - AP,  1-STA
+	bss->short_slot_time_supported = 1;
 
-		bss->short_slot_time_supported = 1;
-		bss->beacon_interval = 0x64;
-		bss->dtim_period = 2;
-		bss->oper_channel = 1;
+	/* lla_coexist */
 
-		bss->ssid.length = wcn->ssid.length;
-		memcpy(bss->ssid.ssid,
-		       wcn->ssid.ssid, wcn->ssid.length);
+	/* llb_coexist */
 
-		bss->obss_prot_enabled = 1;
-		bss->wcn36xx_hal_persona = 1;
-		bss->max_tx_power = 0x10;
+	bss->llg_coexist = 1;
 
-		memcpy(&sta->bssid, &wcn->addresses[0], ETH_ALEN);
-		sta->short_preamble_supported = 1;
-		memcpy(&sta->mac, &wcn->addresses[0], ETH_ALEN);
-		sta->listen_interval = 8;
-	}
+	/* ht20_coexist */
+
+	/* lln_non_gw_coexist */
+
+	/* lsig_tx_op_protection_full_support */
+
+	/* rifs_mode */
+
+	bss->beacon_interval = 0x64;
+
+	bss->dtim_period = 2;
+
+	/* tx_channel_width_set */
+
+	bss->oper_channel = wcn->ch;
+
+	/* ext_channel */
+
+	/* reserved */
+
+	memcpy(&sta->bssid, &wcn->addresses[0], ETH_ALEN);
+
+	/* sta.aid */
+
+	sta->type = 1;
+
+	sta->short_preamble_supported = 1;
+
+	memcpy(&sta->mac, &wcn->addresses[0], ETH_ALEN);
+
+	sta->listen_interval = 8;
+
+	sta->wmm_enabled = 1;
 
-	bss->nw_type = WCN36XX_HAL_11G_NW_TYPE;
 	sta->ht_capable = 1;
+
+	/* sta.tx_channel_width_set */
+
+	/* sta.rifs_mode */
+
+	/* sta.lsig_txop_protection */
+
+	sta->max_ampdu_size = 3;
+
+	sta->max_ampdu_density = 5;
+
 	sta->sgi_40mhz = 1;
+
 	sta->sgi_20Mhz = 1;
 
+	memcpy(&sta->supported_rates, &wcn->supported_rates,
+	       sizeof(wcn->supported_rates));
+
+	/* sta.rmf */
+
+	/* sta.encrypt_type */
+
+	/* sta.action */
+
+	/* sta.uapsd */
+
+	/* sta.max_sp_len */
+
+	/* sta.green_field_capable */
+
+	/* sta.mimo_ps */
+
+	/* sta.delayed_ba_support */
+
+	/* sta.max_ampdu_duration */
+
+	sta->dsss_cck_mode_40mhz = 1;
+
+	sta->sta_index = 0xff;
+
+	/* sta.bssid_index */
+
+	/* sta.p2p */
+
+	/* 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);
+
+	/* action */
+
+	/* rateset */
+
+	/* ht */
+
+	bss->obss_prot_enabled = 1;
+
+	/* rmf */
+
+	/* ht_oper_mode */
+
+	/* dual_cts_protection */
+
+	/* max_probe_resp_retry_limit */
+
+	/* hidden_ssid */
+
+	/* proxy_probe_resp */
+
+	/* edca_params_valid */
+
+	/* acbe */
+
+	/* acbk */
+
+	/* acvi */
+
+	/* acvo */
+
+	/* ext_set_sta_key_param_valid */
+
+	/* ext_set_sta_key_param */
+
+	bss->wcn36xx_hal_persona = 1;
+
+	/* spectrum_mgt_enable */
+
+	/* tx_mgmt_power */
+
+	bss->max_tx_power = 0x10;
+
+
+	/* OLD: */
+
+
 	if (update == 1) {
 		bss->short_slot_time_supported = 1;
 		bss->lln_non_gf_coexist = 1;
@@ -662,9 +767,6 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, enum nl80211_iftype type,
 		sta->bssid_index = 0xff;
 	}
 
-	sta->sta_index = 0xff;
-
-	memcpy(&sta->supported_rates, &wcn->supported_rates, sizeof(wcn->supported_rates));
 
 	if (wcn->fw_minor <= 3)
 		return wcn36xx_smd_config_bss_v1(wcn, &msg);