Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4789efe authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: move hw_rx_handler_setup to iwl-4965.c 



This patch moves hw_rx_handler_setup to iwl-4965.c

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a395b920

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/iwlwifi/iwl-4965.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwlwifi/iwl-core.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/net/wireless/iwlwifi/iwl4965-base.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



/**