aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-3945.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-03-11 19:17:16 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-03-13 19:32:32 -0400
commita4062b8fd231d2625236ad46bff07906c9bc7160 (patch)
treea766c642811bca95ff8cc6f7f0d8e1133bc85eea /drivers/net/wireless/iwlwifi/iwl-3945.c
parente7ec2e3230633a858af1b0b359f6c4670dbeb997 (diff)
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: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 50a641c0c5b7..9a9918e5272b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -980,7 +980,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv,
980 priv->stations[sta_id].current_rate.rate_n_flags = rate; 980 priv->stations[sta_id].current_rate.rate_n_flags = rate;
981 981
982 if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) && 982 if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&
983 (sta_id != IWL3945_BROADCAST_ID) && 983 (sta_id != priv->hw_setting.bcast_sta_id) &&
984 (sta_id != IWL_MULTICAST_ID)) 984 (sta_id != IWL_MULTICAST_ID))
985 priv->stations[IWL_STA_ID].current_rate.rate_n_flags = rate; 985 priv->stations[IWL_STA_ID].current_rate.rate_n_flags = rate;
986 986
@@ -2595,7 +2595,7 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv,
2595 tx_beacon_cmd = (struct iwl3945_tx_beacon_cmd *)&frame->u; 2595 tx_beacon_cmd = (struct iwl3945_tx_beacon_cmd *)&frame->u;
2596 memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd)); 2596 memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));
2597 2597
2598 tx_beacon_cmd->tx.sta_id = IWL3945_BROADCAST_ID; 2598 tx_beacon_cmd->tx.sta_id = priv->hw_setting.bcast_sta_id;
2599 tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; 2599 tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
2600 2600
2601 frame_size = iwl3945_fill_beacon_frame(priv, 2601 frame_size = iwl3945_fill_beacon_frame(priv,