]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
iwlwifi: move hw_rx_handler_setup to iwl-4965.c
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 24 Apr 2008 18:55:20 +0000 (11:55 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 7 May 2008 19:02:22 +0000 (15:02 -0400)
This patch moves hw_rx_handler_setup to iwl-4965.c

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-4965.h
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl4965-base.c

index b1b7363bfdd4d89f9e3f73fe80267eda82898a93..258777366d29e949bd2210886eb7f139fd5fcf4f 100644 (file)
@@ -4065,7 +4065,7 @@ int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
 #endif /* CONFIG_IWL4965_HT */
 
 /* Set up 4965-specific Rx frame reply handlers */
-void iwl4965_hw_rx_handler_setup(struct iwl_priv *priv)
+static void iwl4965_rx_handler_setup(struct iwl_priv *priv)
 {
        /* Legacy Rx frames */
        priv->rx_handlers[REPLY_RX] = iwl4965_rx_reply_rx;
@@ -4119,6 +4119,7 @@ static struct iwl_lib_ops iwl4965_lib = {
        .free_shared_mem = iwl4965_free_shared_mem,
        .txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,
        .hw_nic_init = iwl4965_hw_nic_init,
+       .rx_handler_setup = iwl4965_rx_handler_setup,
        .is_valid_rtc_data_addr = iwl4965_hw_valid_rtc_data_addr,
        .alive_notify = iwl4965_alive_notify,
        .load_ucode = iwl4965_load_bsm,
index 3b7306475531946ef6c53c72aeba3d8b4dbf23db..7b7c6207c9360775c71fbb14585696cdd35c0b6e 100644 (file)
@@ -693,7 +693,6 @@ extern u8 iwl4965_sync_station(struct iwl_priv *priv, int sta_id,
  * iwl4965_mac_     <-- mac80211 callback
  *
  ****************************************************************************/
-extern void iwl4965_hw_rx_handler_setup(struct iwl_priv *priv);
 extern void iwl4965_hw_setup_deferred_work(struct iwl_priv *priv);
 extern void iwl4965_hw_cancel_deferred_work(struct iwl_priv *priv);
 extern int iwl4965_hw_rxq_stop(struct iwl_priv *priv);
index 8196ef7303af351f4d2e044848bd6a36031929e8..fc0c2765f136d89f998548339bd72b3f48aa213c 100644 (file)
@@ -105,6 +105,8 @@ struct iwl_lib_ops {
        void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,
                                        struct iwl4965_tx_queue *txq,
                                        u16 byte_cnt);
+       /* setup Rx handler */
+       void (*rx_handler_setup)(struct iwl_priv *priv);
        /* nic init */
        int (*hw_nic_init)(struct iwl_priv *priv);
        /* alive notification */
index 011f6114c338f402bd4159d946aa626489d2e85d..fbd82d80cad0be47322238120cf461068f562e86 100644 (file)
@@ -3237,7 +3237,7 @@ static void iwl4965_setup_rx_handlers(struct iwl_priv *priv)
        priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx;
 
        /* Set up hardware specific Rx handlers */
-       iwl4965_hw_rx_handler_setup(priv);
+       priv->cfg->ops->lib->rx_handler_setup(priv);
 }
 
 /**