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

Commit 708068db authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: legacy tx_cmd_protection function 



Legacy (4965 and 3945) devices has different tx_cmd_protection routine.
Move to iwl-legacy.c

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e39fdee1

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

+1 −1
Original line number Diff line number Diff line
@@ -2749,7 +2749,7 @@ static const struct iwl_legacy_ops iwl3945_legacy_ops = { 
static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {

	.get_hcmd_size = iwl3945_get_hcmd_size,

	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,

	.tx_cmd_protection = iwlcore_tx_cmd_protection,

	.tx_cmd_protection = iwl_legacy_tx_cmd_protection,

	.request_scan = iwl3945_request_scan,

	.post_scan = iwl3945_post_scan,

};

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

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

	.tx_cmd_protection = iwlcore_tx_cmd_protection,

	.tx_cmd_protection = iwl_legacy_tx_cmd_protection,

	.calc_rssi = iwl4965_calc_rssi,

	.request_scan = iwlagn_request_scan,

	.post_scan = iwl4965_post_scan,

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

+0 −34
Original line number Diff line number Diff line
@@ -288,40 +288,6 @@ void iwlcore_free_geos(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwlcore_free_geos);



/*

 *  iwlcore_tx_cmd_protection: Set rts/cts. 3945 and 4965 only share this

 *  function.

 */

void iwlcore_tx_cmd_protection(struct iwl_priv *priv,

			       struct ieee80211_tx_info *info,

			       __le16 fc, __le32 *tx_flags)

{

	if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) {

		*tx_flags |= TX_CMD_FLG_RTS_MSK;

		*tx_flags &= ~TX_CMD_FLG_CTS_MSK;

		*tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;



		if (!ieee80211_is_mgmt(fc))

			return;



		switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {

		case cpu_to_le16(IEEE80211_STYPE_AUTH):

		case cpu_to_le16(IEEE80211_STYPE_DEAUTH):

		case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):

		case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):

			*tx_flags &= ~TX_CMD_FLG_RTS_MSK;

			*tx_flags |= TX_CMD_FLG_CTS_MSK;

			break;

		}

	} else if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT) {

		*tx_flags &= ~TX_CMD_FLG_RTS_MSK;

		*tx_flags |= TX_CMD_FLG_CTS_MSK;

		*tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;

	}

}

EXPORT_SYMBOL(iwlcore_tx_cmd_protection);





static bool iwl_is_channel_extension(struct iwl_priv *priv,

				     enum ieee80211_band band,

				     u16 channel, u8 extension_chan_offset)

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

+1 −3
Original line number Diff line number Diff line
@@ -447,9 +447,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, 
			     enum nl80211_iftype newtype, bool newp2p);

int iwl_alloc_txq_mem(struct iwl_priv *priv);

void iwl_free_txq_mem(struct iwl_priv *priv);

void iwlcore_tx_cmd_protection(struct iwl_priv *priv,

			       struct ieee80211_tx_info *info,

			       __le16 fc, __le32 *tx_flags);



#ifdef CONFIG_IWLWIFI_DEBUGFS

int iwl_alloc_traffic_mem(struct iwl_priv *priv);

void iwl_free_traffic_mem(struct iwl_priv *priv);

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

+34 −0
Original line number Diff line number Diff line
@@ -620,3 +620,37 @@ irqreturn_t iwl_isr_legacy(int irq, void *data) 
	return IRQ_NONE;

}

EXPORT_SYMBOL(iwl_isr_legacy);



/*

 *  iwl_legacy_tx_cmd_protection: Set rts/cts. 3945 and 4965 only share this

 *  function.

 */

void iwl_legacy_tx_cmd_protection(struct iwl_priv *priv,

			       struct ieee80211_tx_info *info,

			       __le16 fc, __le32 *tx_flags)

{

	if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) {

		*tx_flags |= TX_CMD_FLG_RTS_MSK;

		*tx_flags &= ~TX_CMD_FLG_CTS_MSK;

		*tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;



		if (!ieee80211_is_mgmt(fc))

			return;



		switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {

		case cpu_to_le16(IEEE80211_STYPE_AUTH):

		case cpu_to_le16(IEEE80211_STYPE_DEAUTH):

		case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):

		case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):

			*tx_flags &= ~TX_CMD_FLG_RTS_MSK;

			*tx_flags |= TX_CMD_FLG_CTS_MSK;

			break;

		}

	} else if (info->control.rates[0].flags &

		   IEEE80211_TX_RC_USE_CTS_PROTECT) {

		*tx_flags &= ~TX_CMD_FLG_RTS_MSK;

		*tx_flags |= TX_CMD_FLG_CTS_MSK;

		*tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;

	}

}

EXPORT_SYMBOL(iwl_legacy_tx_cmd_protection);