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

Commit a4062b8f authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: Use sta_bcast_id variable instead of BROADCAST_ID constant 



This patch removes iwlYYY_BROADCAST_ID from run time usage.
hw_setting.sta_bcast_id is used instead.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e7ec2e32

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

+2 −2
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv, 
	priv->stations[sta_id].current_rate.rate_n_flags = rate;



	if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&

	    (sta_id != IWL3945_BROADCAST_ID) &&

	    (sta_id != priv->hw_setting.bcast_sta_id) &&

		(sta_id != IWL_MULTICAST_ID))

		priv->stations[IWL_STA_ID].current_rate.rate_n_flags = rate;
@@ -2595,7 +2595,7 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_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 = IWL3945_BROADCAST_ID;

	tx_beacon_cmd->tx.sta_id = priv->hw_setting.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
@@ -254,7 +254,7 @@ u8 iwl4965_hw_find_station(struct iwl4965_priv *priv, const u8 *addr) 
		start = IWL_STA_ID;



	if (is_broadcast_ether_addr(addr))

		return IWL4965_BROADCAST_ID;

		return priv->hw_setting.bcast_sta_id;



	spin_lock_irqsave(&priv->sta_lock, flags);

	for (i = start; i < priv->hw_setting.max_stations; i++)
@@ -2836,7 +2836,7 @@ unsigned int iwl4965_hw_get_beacon_cmd(struct iwl4965_priv *priv, 
	tx_beacon_cmd = &frame->u.beacon;

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



	tx_beacon_cmd->tx.sta_id = IWL4965_BROADCAST_ID;

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

	tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;



	frame_size = iwl4965_fill_beacon_frame(priv,
@@ -4436,7 +4436,7 @@ void iwl4965_add_station(struct iwl4965_priv *priv, const u8 *addr, int is_ap) 
	link_cmd.agg_params.agg_time_limit = cpu_to_le16(4000);



	/* Update the rate scaling for control frame Tx to AP */

	link_cmd.sta_id = is_ap ? IWL_AP_ID : IWL4965_BROADCAST_ID;

	link_cmd.sta_id = is_ap ? IWL_AP_ID : priv->hw_setting.bcast_sta_id;



	iwl4965_send_cmd_pdu(priv, REPLY_TX_LINK_QUALITY_CMD, sizeof(link_cmd),

			 &link_cmd);