Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a194e324 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: contextify broadcast station 



The broadcast station ID is per context, so
add a variable for the ID in the context and
use it everywhere we previously hardcoded it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 751ca305

drivers/net/wireless/iwlwifi/iwl-1000.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
			sizeof(struct iwlagn_scd_bc_tbl);

	priv->hw_params.tfd_size = sizeof(struct iwl_tfd);

	priv->hw_params.max_stations = IWLAGN_STATION_COUNT;

	priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
@@ -217,7 +217,7 @@ static struct iwl_lib_ops iwl1000_lib = { 
		.set_ct_kill = iwl1000_set_ct_threshold,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_station = iwl_update_bcast_station,

	.update_bcast_stations = iwl_update_bcast_stations,

	.debugfs_ops = {

		.rx_stats_read = iwl_ucode_rx_stats_read,

		.tx_stats_read = iwl_ucode_tx_stats_read,

drivers/net/wireless/iwlwifi/iwl-3945-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void iwl3945_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 s 
	int i;



	IWL_DEBUG_INFO(priv, "enter\n");

	if (sta_id == priv->hw_params.bcast_sta_id)

	if (sta_id == priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id)

		goto out;



	psta = (struct iwl3945_sta_priv *) sta->drv_priv;

drivers/net/wireless/iwlwifi/iwl-3945.c

+7 −4
Original line number Diff line number Diff line
@@ -2305,7 +2305,9 @@ static int iwl3945_manage_ibss_station(struct iwl_priv *priv, 
	int ret;



	if (add) {

		ret = iwl_add_bssid_station(priv, vif->bss_conf.bssid, false,

		ret = iwl_add_bssid_station(

				priv, &priv->contexts[IWL_RXON_CTX_BSS],

				vif->bss_conf.bssid, false,

				&vif_priv->ibss_bssid_sta_id);

		if (ret)

			return ret;
@@ -2424,7 +2426,7 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;

	priv->hw_params.max_stations = IWL3945_STATION_COUNT;

	priv->hw_params.bcast_sta_id = IWL3945_BROADCAST_ID;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWL3945_BROADCAST_ID;



	priv->hw_params.rx_wrt_ptr_reg = FH39_RSCSR_CHNL0_WPTR;

	priv->hw_params.max_beacon_itrvl = IWL39_MAX_UCODE_BEACON_INTERVAL;
@@ -2442,7 +2444,8 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl_priv *priv, 
	tx_beacon_cmd = (struct iwl3945_tx_beacon_cmd *)&frame->u;

	memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));



	tx_beacon_cmd->tx.sta_id = priv->hw_params.bcast_sta_id;

	tx_beacon_cmd->tx.sta_id =

		priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id;

	tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;



	frame_size = iwl3945_fill_beacon_frame(priv,

drivers/net/wireless/iwlwifi/iwl-4965.c

+3 −3
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv) 
			sizeof(struct iwl4965_scd_bc_tbl);

	priv->hw_params.tfd_size = sizeof(struct iwl_tfd);

	priv->hw_params.max_stations = IWL4965_STATION_COUNT;

	priv->hw_params.bcast_sta_id = IWL4965_BROADCAST_ID;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWL4965_BROADCAST_ID;

	priv->hw_params.max_data_size = IWL49_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWL49_RTC_INST_SIZE;

	priv->hw_params.max_bsm_size = BSM_SRAM_SIZE;
@@ -2010,7 +2010,7 @@ static u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr) 
		start = IWL_STA_ID;



	if (is_broadcast_ether_addr(addr))

		return priv->hw_params.bcast_sta_id;

		return priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id;



	spin_lock_irqsave(&priv->sta_lock, flags);

	for (i = start; i < priv->hw_params.max_stations; i++)
@@ -2283,7 +2283,7 @@ static struct iwl_lib_ops iwl4965_lib = { 
		.set_ct_kill = iwl4965_set_ct_threshold,

	},

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_station = iwl_update_bcast_station,

	.update_bcast_stations = iwl_update_bcast_stations,

	.debugfs_ops = {

		.rx_stats_read = iwl_ucode_rx_stats_read,

		.tx_stats_read = iwl_ucode_tx_stats_read,

drivers/net/wireless/iwlwifi/iwl-5000.c

+4 −4
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
			sizeof(struct iwlagn_scd_bc_tbl);

	priv->hw_params.tfd_size = sizeof(struct iwl_tfd);

	priv->hw_params.max_stations = IWLAGN_STATION_COUNT;

	priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
@@ -227,7 +227,7 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
			sizeof(struct iwlagn_scd_bc_tbl);

	priv->hw_params.tfd_size = sizeof(struct iwl_tfd);

	priv->hw_params.max_stations = IWLAGN_STATION_COUNT;

	priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
@@ -398,7 +398,7 @@ static struct iwl_lib_ops iwl5000_lib = { 
		.set_ct_kill = iwl5000_set_ct_threshold,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_station = iwl_update_bcast_station,

	.update_bcast_stations = iwl_update_bcast_stations,

	.debugfs_ops = {

		.rx_stats_read = iwl_ucode_rx_stats_read,

		.tx_stats_read = iwl_ucode_tx_stats_read,
@@ -469,7 +469,7 @@ static struct iwl_lib_ops iwl5150_lib = { 
		.set_ct_kill = iwl5150_set_ct_threshold,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_station = iwl_update_bcast_station,

	.update_bcast_stations = iwl_update_bcast_stations,

	.debugfs_ops = {

		.rx_stats_read = iwl_ucode_rx_stats_read,

		.tx_stats_read = iwl_ucode_tx_stats_read,