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

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

iwlwifi: fixes RTS / CTS support 



This patch fixes the RTS / CTS support in iwlwifi. 5000 will send CTS to
self when allowed by spec, 4965 will send RTS or CTS to self according to
mac80211 request.

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

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

+13 −0
Original line number Diff line number Diff line
@@ -642,6 +642,18 @@ static void iwl4965_gain_computation(struct iwl_priv *priv, 
	data->beacon_count = 0;

}



static void iwl4965_rts_tx_cmd_flag(struct ieee80211_tx_info *info,

			__le32 *tx_flags)

{

	if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) {

		*tx_flags |= TX_CMD_FLG_RTS_MSK;

		*tx_flags &= ~TX_CMD_FLG_CTS_MSK;

	} else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) {

		*tx_flags &= ~TX_CMD_FLG_RTS_MSK;

		*tx_flags |= TX_CMD_FLG_CTS_MSK;

	}

}



static void iwl4965_bg_txpower_work(struct work_struct *work)

{

	struct iwl_priv *priv = container_of(work, struct iwl_priv,
@@ -2372,6 +2384,7 @@ static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = { 
	.build_addsta_hcmd = iwl4965_build_addsta_hcmd,

	.chain_noise_reset = iwl4965_chain_noise_reset,

	.gain_computation = iwl4965_gain_computation,

	.rts_tx_cmd_flag = iwl4965_rts_tx_cmd_flag,

};



static struct iwl_lib_ops iwl4965_lib = {

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

+11 −0
Original line number Diff line number Diff line
@@ -370,6 +370,16 @@ static void iwl5000_chain_noise_reset(struct iwl_priv *priv) 
	}

}



static void iwl5000_rts_tx_cmd_flag(struct ieee80211_tx_info *info,

			__le32 *tx_flags)

{

	if ((info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) ||

	    (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT))

		*tx_flags |= TX_CMD_FLG_RTS_CTS_MSK;

	else

		*tx_flags &= ~TX_CMD_FLG_RTS_CTS_MSK;

}



static struct iwl_sensitivity_ranges iwl5000_sensitivity = {

	.min_nrg_cck = 95,

	.max_nrg_cck = 0,
@@ -1437,6 +1447,7 @@ static struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = { 
	.build_addsta_hcmd = iwl5000_build_addsta_hcmd,

	.gain_computation = iwl5000_gain_computation,

	.chain_noise_reset = iwl5000_chain_noise_reset,

	.rts_tx_cmd_flag = iwl5000_rts_tx_cmd_flag,

};



static struct iwl_lib_ops iwl5000_lib = {

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

+7 −0
Original line number Diff line number Diff line
@@ -556,6 +556,8 @@ enum { 
#define RXON_FLG_CHANNEL_MODE_MSK		__constant_cpu_to_le32(0x3 << 25)

#define RXON_FLG_CHANNEL_MODE_PURE_40_MSK	__constant_cpu_to_le32(0x1 << 25)

#define RXON_FLG_CHANNEL_MODE_MIXED_MSK		__constant_cpu_to_le32(0x2 << 25)

/* CTS to self (if spec allows) flag */

#define RXON_FLG_SELF_CTS_EN			__constant_cpu_to_le32(0x1<<30)



/* rx_config filter flags */

/* accept all data frames */
@@ -1139,6 +1141,11 @@ struct iwl4965_rx_mpdu_res_start { 


/* REPLY_TX Tx flags field */



/* 1: Use RTS/CTS protocol or CTS-to-self if spec alows it

 * before this frame. if CTS-to-self required check

 * RXON_FLG_SELF_CTS_EN status. */

#define TX_CMD_FLG_RTS_CTS_MSK __constant_cpu_to_le32(1 << 0)



/* 1: Use Request-To-Send protocol before this frame.

 * Mutually exclusive vs. TX_CMD_FLG_CTS_MSK. */

#define TX_CMD_FLG_RTS_MSK __constant_cpu_to_le32(1 << 1)

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

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ struct iwl_hcmd_utils_ops { 
			u16 min_average_noise_antennat_i,

			u32 min_average_noise);

	void (*chain_noise_reset)(struct iwl_priv *priv);

	void (*rts_tx_cmd_flag)(struct ieee80211_tx_info *info,

			__le32 *tx_flags);

};



struct iwl_lib_ops {

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

+1 −7
Original line number Diff line number Diff line
@@ -601,13 +601,7 @@ static void iwl_tx_cmd_build_basic(struct iwl_priv *priv, 
		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;

	}



	if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) {

		tx_flags |= TX_CMD_FLG_RTS_MSK;

		tx_flags &= ~TX_CMD_FLG_CTS_MSK;

	} else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) {

		tx_flags &= ~TX_CMD_FLG_RTS_MSK;

		tx_flags |= TX_CMD_FLG_CTS_MSK;

	}

	priv->cfg->ops->utils->rts_tx_cmd_flag(info, &tx_flags);



	if ((tx_flags & TX_CMD_FLG_RTS_MSK) || (tx_flags & TX_CMD_FLG_CTS_MSK))

		tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;