aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.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-4965.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-4965.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index b2985e25dc83..d7d956db19d1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -815,6 +815,7 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv)
815 priv->hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM; 815 priv->hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM;
816 priv->hw_params.scd_bc_tbls_size = 816 priv->hw_params.scd_bc_tbls_size =
817 IWL49_NUM_QUEUES * sizeof(struct iwl4965_scd_bc_tbl); 817 IWL49_NUM_QUEUES * sizeof(struct iwl4965_scd_bc_tbl);
818 priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
818 priv->hw_params.max_stations = IWL4965_STATION_COUNT; 819 priv->hw_params.max_stations = IWL4965_STATION_COUNT;
819 priv->hw_params.bcast_sta_id = IWL4965_BROADCAST_ID; 820 priv->hw_params.bcast_sta_id = IWL4965_BROADCAST_ID;
820 priv->hw_params.max_data_size = IWL49_RTC_DATA_SIZE; 821 priv->hw_params.max_data_size = IWL49_RTC_DATA_SIZE;
@@ -2297,6 +2298,7 @@ static struct iwl_lib_ops iwl4965_lib = {
2297 .txq_agg_disable = iwl4965_txq_agg_disable, 2298 .txq_agg_disable = iwl4965_txq_agg_disable,
2298 .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, 2299 .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
2299 .txq_free_tfd = iwl_hw_txq_free_tfd, 2300 .txq_free_tfd = iwl_hw_txq_free_tfd,
2301 .txq_init = iwl_hw_tx_queue_init,
2300 .rx_handler_setup = iwl4965_rx_handler_setup, 2302 .rx_handler_setup = iwl4965_rx_handler_setup,
2301 .setup_deferred_work = iwl4965_setup_deferred_work, 2303 .setup_deferred_work = iwl4965_setup_deferred_work,
2302 .cancel_deferred_work = iwl4965_cancel_deferred_work, 2304 .cancel_deferred_work = iwl4965_cancel_deferred_work,