aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-5000.c
diff options
context:
space:
mode:
authorSamuel Ortiz <samuel.ortiz@intel.com>2009-01-23 16:45:14 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:01:34 -0500
commita8e74e2774cd1aecfef0460de07e6e178df89232 (patch)
treebccf507738fb8753e7ab16a8de9644e9d99ae07c /drivers/net/wireless/iwlwifi/iwl-5000.c
parent59606ffa9146538b73bbe1ca1285321cd7474bc0 (diff)
iwl3945: Use iwlcore TX queue management routines
By adding an additional hw_params (tfd_size) and a new iwl_lib ops (txq_init), we can now use the iwlcore TX queue management routines. We had to add a new hw_params because we need to allocate the right DMA buffer for TFDs, and those have a different sizes depending if you're on 3945 or agn. Signed-off-by: Samuel Ortiz <samuel.ortiz@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-5000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-5000.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 04c2585a6341..89d92a8ca157 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -837,6 +837,7 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
837 priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM; 837 priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
838 priv->hw_params.scd_bc_tbls_size = 838 priv->hw_params.scd_bc_tbls_size =
839 IWL50_NUM_QUEUES * sizeof(struct iwl5000_scd_bc_tbl); 839 IWL50_NUM_QUEUES * sizeof(struct iwl5000_scd_bc_tbl);
840 priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
840 priv->hw_params.max_stations = IWL5000_STATION_COUNT; 841 priv->hw_params.max_stations = IWL5000_STATION_COUNT;
841 priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID; 842 priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
842 priv->hw_params.max_data_size = IWL50_RTC_DATA_SIZE; 843 priv->hw_params.max_data_size = IWL50_RTC_DATA_SIZE;
@@ -1494,6 +1495,7 @@ static struct iwl_lib_ops iwl5000_lib = {
1494 .txq_agg_disable = iwl5000_txq_agg_disable, 1495 .txq_agg_disable = iwl5000_txq_agg_disable,
1495 .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, 1496 .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
1496 .txq_free_tfd = iwl_hw_txq_free_tfd, 1497 .txq_free_tfd = iwl_hw_txq_free_tfd,
1498 .txq_init = iwl_hw_tx_queue_init,
1497 .rx_handler_setup = iwl5000_rx_handler_setup, 1499 .rx_handler_setup = iwl5000_rx_handler_setup,
1498 .setup_deferred_work = iwl5000_setup_deferred_work, 1500 .setup_deferred_work = iwl5000_setup_deferred_work,
1499 .is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr, 1501 .is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,