Commit 59fa61f3 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: remove sw_csum_tx 



This was a hack done to test the data path of devices that
didn't support well CSUM offload in Tx. This is not needed
anymore.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201209231352.6c9fc9fb48d5.I2aaebf90e6fe81860105d049a8d35746fa8d86c2@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent df72138d

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+0 −2
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ struct iwl_hcmd_arr { 
 * @bc_table_dword: set to true if the BC table expects the byte count to be

 *	in DWORD (as opposed to bytes)

 * @scd_set_active: should the transport configure the SCD for HCMD queue

 * @sw_csum_tx: transport should compute the TCP checksum

 * @command_groups: array of command groups, each member is an array of the

 *	commands in the group; for debugging only

 * @command_groups_size: number of command groups, to avoid illegal access
@@ -451,7 +450,6 @@ struct iwl_trans_config { 
	enum iwl_amsdu_size rx_buf_size;

	bool bc_table_dword;

	bool scd_set_active;

	bool sw_csum_tx;

	const struct iwl_hcmd_arr *command_groups;

	int command_groups_size;

drivers/net/wireless/intel/iwlwifi/mvm/constants.h

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ 
#define IWL_MVM_RS_RSSI_BASED_INIT_RATE         0

#define IWL_MVM_RS_80_20_FAR_RANGE_TWEAK	1

#define IWL_MVM_TOF_IS_RESPONDER		0

#define IWL_MVM_SW_TX_CSUM_OFFLOAD		0

#define IWL_MVM_HW_CSUM_DISABLE			0

#define IWL_MVM_PARSE_NVM			0

#define IWL_MVM_ADWELL_ENABLE			1

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+1 −5
Original line number Diff line number Diff line
@@ -754,13 +754,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	}



	hw->netdev_features |= mvm->cfg->features;

	if (!iwl_mvm_is_csum_supported(mvm)) {

	if (!iwl_mvm_is_csum_supported(mvm))

		hw->netdev_features &= ~(IWL_TX_CSUM_NETIF_FLAGS |

					 NETIF_F_RXCSUM);

		/* We may support SW TX CSUM */

		if (IWL_MVM_SW_TX_CSUM_OFFLOAD)

			hw->netdev_features |= IWL_TX_CSUM_NETIF_FLAGS;

	}



	if (mvm->cfg->vht_mu_mimo_supported)

		wiphy_ext_feature_set(hw->wiphy,

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+0 −2
Original line number Diff line number Diff line
@@ -775,8 +775,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	trans_cfg.cb_data_offs = offsetof(struct ieee80211_tx_info,

					  driver_data[2]);



	trans_cfg.sw_csum_tx = IWL_MVM_SW_TX_CSUM_OFFLOAD;



	/* Set a short watchdog for the command queue */

	trans_cfg.cmd_q_wdg_timeout =

		iwl_mvm_get_wd_timeout(mvm, NULL, false, true);

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+2 −5
Original line number Diff line number Diff line
@@ -105,11 +105,8 @@ static u16 iwl_mvm_tx_csum(struct iwl_mvm *mvm, struct sk_buff *skb, 
	u16 mh_len = ieee80211_hdrlen(hdr->frame_control);

	u8 protocol = 0;



	/*

	 * Do not compute checksum if already computed or if transport will

	 * compute it

	 */

	if (skb->ip_summed != CHECKSUM_PARTIAL || IWL_MVM_SW_TX_CSUM_OFFLOAD)

	/* Do not compute checksum if already computed */

	if (skb->ip_summed != CHECKSUM_PARTIAL)

		goto out;



	/* We do not expect to be requested to csum stuff we do not support */