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

Commit 141c43a3 authored Jan 08, 2009 by Winkler, Tomas Committed by John W. Linville Jan 29, 2009

iwl3945: kill iwl3945_rx_queue_restock



This patch kills iwl3945_rx_queue_restock function on prise of new
hw_params.rx_wrt_ptr_reg which holds per NIC RX write pointer register.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent f5965955

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1218,7 +1218,7 @@ int iwl3945_hw_nic_init(struct iwl_priv *priv)

	/* Look at using this instead:		/* Look at using this instead:
	rxq->need_update = 1;		rxq->need_update = 1;
	iwl3945_rx_queue_update_write_ptr(priv, rxq);		iwl_rx_queue_update_write_ptr(priv, rxq);
	*/		*/

	rc = iwl_grab_nic_access(priv);		rc = iwl_grab_nic_access(priv);
	@@ -2492,6 +2492,8 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv)
	priv->hw_params.max_stations = IWL3945_STATION_COUNT;		priv->hw_params.max_stations = IWL3945_STATION_COUNT;
	priv->hw_params.bcast_sta_id = IWL3945_BROADCAST_ID;		priv->hw_params.bcast_sta_id = IWL3945_BROADCAST_ID;

			priv->hw_params.rx_wrt_ptr_reg = FH39_RSCSR_CHNL0_WPTR;

	return 0;		return 0;
	}		}

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -225,8 +225,6 @@ extern int __must_check iwl3945_send_cmd(struct iwl_priv *priv,
	struct iwl_host_cmd *cmd);		struct iwl_host_cmd *cmd);
	extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,		extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
	struct ieee80211_hdr *hdr,int left);		struct ieee80211_hdr *hdr,int left);
	extern int iwl3945_rx_queue_update_write_ptr(struct iwl_priv *priv,
	struct iwl_rx_queue *q);
	extern int iwl3945_send_statistics_request(struct iwl_priv *priv);		extern int iwl3945_send_statistics_request(struct iwl_priv *priv);
	extern void iwl3945_set_decrypted_flag(struct iwl_priv priv, struct sk_buff skb,		extern void iwl3945_set_decrypted_flag(struct iwl_priv priv, struct sk_buff skb,
	u32 decrypt_res,		u32 decrypt_res,

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -822,6 +822,8 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv)
	priv->hw_params.max_bsm_size = BSM_SRAM_SIZE;		priv->hw_params.max_bsm_size = BSM_SRAM_SIZE;
	priv->hw_params.fat_channel = BIT(IEEE80211_BAND_5GHZ);		priv->hw_params.fat_channel = BIT(IEEE80211_BAND_5GHZ);

			priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;

	priv->hw_params.tx_chains_num = 2;		priv->hw_params.tx_chains_num = 2;
	priv->hw_params.rx_chains_num = 2;		priv->hw_params.rx_chains_num = 2;
	priv->hw_params.valid_tx_ant = ANT_A \| ANT_B;		priv->hw_params.valid_tx_ant = ANT_A \| ANT_B;

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -844,6 +844,8 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
	priv->hw_params.max_bsm_size = 0;		priv->hw_params.max_bsm_size = 0;
	priv->hw_params.fat_channel = BIT(IEEE80211_BAND_2GHZ) \|		priv->hw_params.fat_channel = BIT(IEEE80211_BAND_2GHZ) \|
	BIT(IEEE80211_BAND_5GHZ);		BIT(IEEE80211_BAND_5GHZ);
			priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;

	priv->hw_params.sens = &iwl5000_sensitivity;		priv->hw_params.sens = &iwl5000_sensitivity;

	switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) {		switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) {

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -563,6 +563,7 @@ struct iwl_sensitivity_ranges {
	* @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)		* @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)
	* @max_rxq_log: Log-base-2 of max_rxq_size		* @max_rxq_log: Log-base-2 of max_rxq_size
	* @rx_buf_size: Rx buffer size		* @rx_buf_size: Rx buffer size
			* @rx_wrt_ptr_reg: FH{39}_RSCSR_CHNL0_WPTR
	* @max_stations:		* @max_stations:
	* @bcast_sta_id:		* @bcast_sta_id:
	* @fat_channel: is 40MHz width possible in band 2.4		* @fat_channel: is 40MHz width possible in band 2.4
	@@ -584,6 +585,7 @@ struct iwl_hw_params {
	u16 max_rxq_size;		u16 max_rxq_size;
	u16 max_rxq_log;		u16 max_rxq_log;
	u32 rx_buf_size;		u32 rx_buf_size;
			u32 rx_wrt_ptr_reg;
	u32 max_pkt_size;		u32 max_pkt_size;
	u8 max_stations;		u8 max_stations;
	u8 bcast_sta_id;		u8 bcast_sta_id;