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

Commit 768db982 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945: rearrange the code. 



Rearrange the code and groups setting of
retry_limit and data_retry_limits code together.
Make 'data_retry_limit' setting similar to iwlwifi
for better readability.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1f0436f4

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

+11 −8
Original line number Diff line number Diff line
@@ -794,17 +794,22 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv, 
	 * in this running context */

	rate_mask = IWL_RATES_MASK;





	/* Set retry limit on DATA packets and Probe Responses*/

	if (ieee80211_is_probe_resp(fc))

		data_retry_limit = 3;

	else

		data_retry_limit = IWL_DEFAULT_TX_RETRY;

	tx_cmd->data_retry_limit = data_retry_limit;



	if (tx_id >= IWL_CMD_QUEUE_NUM)

		rts_retry_limit = 3;

	else

		rts_retry_limit = 7;



	if (ieee80211_is_probe_resp(fc)) {

		data_retry_limit = 3;

	if (data_retry_limit < rts_retry_limit)

		rts_retry_limit = data_retry_limit;

	} else

		data_retry_limit = IWL_DEFAULT_TX_RETRY;

	tx_cmd->rts_retry_limit = rts_retry_limit;



	if (ieee80211_is_mgmt(fc)) {

		switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
@@ -822,8 +827,6 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv, 
		}

	}



	tx_cmd->rts_retry_limit = rts_retry_limit;

	tx_cmd->data_retry_limit = data_retry_limit;

	tx_cmd->rate = rate;

	tx_cmd->tx_flags = tx_flags;