[PATCH 2/4] Remove redundant beacon_interval parameter

Eugene Krasnikov k.eugene.e at gmail.com
Tue Jul 16 07:01:49 EDT 2013


config_bss does not need to have extra parameter for
beacon_interval since it’s available from wcn struct.

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

diff --git a/main.c b/main.c
index f12812f..3e926c5 100644
--- a/main.c
+++ b/main.c
@@ -390,8 +390,7 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 						       vif,
 						       sta,
 						       sta->addr,
-						       true,
-						       wcn->beacon_interval);
+						       true);
 
 			wcn36xx_smd_set_stakey(wcn,
 				wcn->encrypt_type,
@@ -527,8 +526,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 			wcn36xx_smd_join(wcn, bss_conf->bssid,
 					 vif->addr, WCN36XX_HW_CHANNEL(wcn));
 			wcn36xx_smd_config_bss(wcn, vif, NULL,
-					       bss_conf->bssid, false,
-					       wcn->beacon_interval);
+					       bss_conf->bssid, false);
 		} else {
 			wcn->is_joining = false;
 			wcn36xx_smd_delete_bss(wcn);
@@ -573,7 +571,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 						WCN36XX_HAL_LINK_POSTASSOC_STATE);
 			wcn36xx_smd_config_bss(wcn, vif, sta,
 					       bss_conf->bssid,
-					       true, wcn->beacon_interval);
+					       true);
 			wcn36xx_smd_config_sta(wcn, vif, sta);
 			rcu_read_unlock();
 		} else {
@@ -610,8 +608,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 		if (bss_conf->enable_beacon) {
 			wcn->beacon_enable = true;
 			wcn36xx_smd_config_bss(wcn, vif, NULL,
-					       wcn->addresses[0].addr, false,
-					       wcn->beacon_interval);
+					       wcn->addresses[0].addr, false);
 			skb = ieee80211_beacon_get_tim(hw, vif, &tim_off,
 						       &tim_len);
 			if (!skb) {
diff --git a/smd.c b/smd.c
index 3753756..d886ae8 100644
--- a/smd.c
+++ b/smd.c
@@ -756,7 +756,7 @@ static int wcn36xx_smd_config_bss_v1(struct wcn36xx *wcn,
 
 int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
 			   struct ieee80211_sta *sta, const u8 *bssid,
-			   bool update, u16 beacon_interval)
+			   bool update)
 {
 	struct wcn36xx_hal_config_bss_req_msg msg;
 	struct wcn36xx_hal_config_bss_params *bss;
@@ -803,7 +803,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 = beacon_interval;
+	bss->beacon_interval = wcn->beacon_interval;
 	bss->dtim_period = wcn->dtim_period;
 	bss->tx_channel_width_set = 0;
 	bss->oper_channel = WCN36XX_HW_CHANNEL(wcn);
diff --git a/smd.h b/smd.h
index fc8b29c..935936d 100644
--- a/smd.h
+++ b/smd.h
@@ -64,7 +64,7 @@ int wcn36xx_smd_set_link_st(struct wcn36xx *wcn, const u8 *bssid,
 			    enum wcn36xx_hal_link_state state);
 int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
 			   struct ieee80211_sta *sta, const u8 *bssid,
-			   bool update, u16 beacon_interval);
+			   bool update);
 int wcn36xx_smd_delete_bss(struct wcn36xx *wcn);
 int wcn36xx_smd_config_sta(struct wcn36xx *wcn, struct ieee80211_vif *vif,
 			   struct ieee80211_sta *sta);
-- 
1.7.11.3




More information about the wcn36xx mailing list