diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-03 11:31:44 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:56:00 -0500 |
commit | b16db50a6dc486c3a6c32cd7982a75452cb785c2 (patch) | |
tree | 3d64888f2a5a5d5538606c2cbcf165d628fba4e9 /drivers/net/wireless/iwlegacy/3945.c | |
parent | 8f9e56455310a3d75e8239db9729acb2b31dbdad (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/3945.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c index dc0433f6801c..3024645a6be9 100644 --- a/drivers/net/wireless/iwlegacy/3945.c +++ b/drivers/net/wireless/iwlegacy/3945.c | |||
@@ -2396,6 +2396,8 @@ il3945_hw_set_hw_params(struct il_priv *il) | |||
2396 | return -ENOMEM; | 2396 | return -ENOMEM; |
2397 | } | 2397 | } |
2398 | 2398 | ||
2399 | il->hw_params.bcast_id = IL3945_BROADCAST_ID; | ||
2400 | |||
2399 | /* Assign number of Usable TX queues */ | 2401 | /* Assign number of Usable TX queues */ |
2400 | il->hw_params.max_txq_num = il->cfg->base_params->num_of_queues; | 2402 | il->hw_params.max_txq_num = il->cfg->base_params->num_of_queues; |
2401 | 2403 | ||
@@ -2404,7 +2406,6 @@ il3945_hw_set_hw_params(struct il_priv *il) | |||
2404 | il->hw_params.max_rxq_size = RX_QUEUE_SIZE; | 2406 | il->hw_params.max_rxq_size = RX_QUEUE_SIZE; |
2405 | il->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG; | 2407 | il->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG; |
2406 | il->hw_params.max_stations = IL3945_STATION_COUNT; | 2408 | il->hw_params.max_stations = IL3945_STATION_COUNT; |
2407 | il->ctx.bcast_sta_id = IL3945_BROADCAST_ID; | ||
2408 | 2409 | ||
2409 | il->sta_key_max_num = STA_KEY_MAX_NUM; | 2410 | il->sta_key_max_num = STA_KEY_MAX_NUM; |
2410 | 2411 | ||
@@ -2425,7 +2426,7 @@ il3945_hw_get_beacon_cmd(struct il_priv *il, struct il3945_frame *frame, | |||
2425 | tx_beacon_cmd = (struct il3945_tx_beacon_cmd *)&frame->u; | 2426 | tx_beacon_cmd = (struct il3945_tx_beacon_cmd *)&frame->u; |
2426 | memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd)); | 2427 | memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd)); |
2427 | 2428 | ||
2428 | tx_beacon_cmd->tx.sta_id = il->ctx.bcast_sta_id; | 2429 | tx_beacon_cmd->tx.sta_id = il->hw_params.bcast_id; |
2429 | tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; | 2430 | tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; |
2430 | 2431 | ||
2431 | frame_size = | 2432 | frame_size = |