summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlegacy/common.h
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2012-02-03 17:31:44 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-02-06 14:56:00 -0500
commitb16db50a6dc486c3a6c32cd7982a75452cb785c2 (patch)
tree3d64888f2a5a5d5538606c2cbcf165d628fba4e9 /drivers/net/wireless/iwlegacy/common.h
parent8f9e56455310a3d75e8239db9729acb2b31dbdad (diff)
iwlegacy: move bcast_sta_id to hw_params
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.h')
-rw-r--r--drivers/net/wireless/iwlegacy/common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index cf7352f45cdb..66d0c1dd5894 100644
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -816,6 +816,7 @@ struct il_sensitivity_ranges {
/**
* struct il_hw_params
+ * @bcast_id: f/w broadcast station ID
* @max_txq_num: Max # Tx queues supported
* @dma_chnl_num: Number of Tx DMA/FIFO channels
* @scd_bc_tbls_size: size of scheduler byte count tables
@@ -836,6 +837,7 @@ struct il_sensitivity_ranges {
* @struct il_sensitivity_ranges: range of sensitivity values
*/
struct il_hw_params {
+ u8 bcast_id;
u8 max_txq_num;
u8 dma_chnl_num;
u16 scd_bc_tbls_size;
@@ -1173,8 +1175,6 @@ struct il_rxon_context {
struct il_qos_info qos_data;
- u8 bcast_sta_id;
-
struct il_wep_key wep_keys[WEP_KEYS_MAX];
u8 key_mapping_keys;
@@ -2372,7 +2372,7 @@ il_sta_id_or_broadcast(struct il_priv *il, struct il_rxon_context *context,
int sta_id;
if (!sta)
- return context->bcast_sta_id;
+ return il->hw_params.bcast_id;
sta_id = il_sta_id(sta);