diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-08-27 11:53:46 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-08-27 11:53:46 -0400 |
commit | a194e3249baf954dc34c67cdad5b8bed36f49e72 (patch) | |
tree | 2010fbba8fdae3179a1439f2038e30694a85124f /drivers/net/wireless/iwlwifi/iwl-6000.c | |
parent | 751ca305d0e37f0d44b6a261e7db31aa6b60fbf4 (diff) |
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index bf1fe25fae73..8c4a98b82e35 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -161,7 +161,7 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) | |||
161 | sizeof(struct iwlagn_scd_bc_tbl); | 161 | sizeof(struct iwlagn_scd_bc_tbl); |
162 | priv->hw_params.tfd_size = sizeof(struct iwl_tfd); | 162 | priv->hw_params.tfd_size = sizeof(struct iwl_tfd); |
163 | priv->hw_params.max_stations = IWLAGN_STATION_COUNT; | 163 | priv->hw_params.max_stations = IWLAGN_STATION_COUNT; |
164 | priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID; | 164 | priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID; |
165 | 165 | ||
166 | priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE; | 166 | priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE; |
167 | priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE; | 167 | priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE; |
@@ -323,7 +323,7 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
323 | .set_calib_version = iwl6000_set_calib_version, | 323 | .set_calib_version = iwl6000_set_calib_version, |
324 | }, | 324 | }, |
325 | .manage_ibss_station = iwlagn_manage_ibss_station, | 325 | .manage_ibss_station = iwlagn_manage_ibss_station, |
326 | .update_bcast_station = iwl_update_bcast_station, | 326 | .update_bcast_stations = iwl_update_bcast_stations, |
327 | .debugfs_ops = { | 327 | .debugfs_ops = { |
328 | .rx_stats_read = iwl_ucode_rx_stats_read, | 328 | .rx_stats_read = iwl_ucode_rx_stats_read, |
329 | .tx_stats_read = iwl_ucode_tx_stats_read, | 329 | .tx_stats_read = iwl_ucode_tx_stats_read, |
@@ -398,7 +398,7 @@ static struct iwl_lib_ops iwl6000g2b_lib = { | |||
398 | .set_calib_version = iwl6000_set_calib_version, | 398 | .set_calib_version = iwl6000_set_calib_version, |
399 | }, | 399 | }, |
400 | .manage_ibss_station = iwlagn_manage_ibss_station, | 400 | .manage_ibss_station = iwlagn_manage_ibss_station, |
401 | .update_bcast_station = iwl_update_bcast_station, | 401 | .update_bcast_stations = iwl_update_bcast_stations, |
402 | .debugfs_ops = { | 402 | .debugfs_ops = { |
403 | .rx_stats_read = iwl_ucode_rx_stats_read, | 403 | .rx_stats_read = iwl_ucode_rx_stats_read, |
404 | .tx_stats_read = iwl_ucode_tx_stats_read, | 404 | .tx_stats_read = iwl_ucode_tx_stats_read, |