Commit 08365d3b authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: mvm: fix netif csum flags 



We shouldn't advertise arbitrary checksum flags since we had
to remove support for it due to broken hardware.

Fixes: ec18e7d4 ("wifi: iwlwifi: mvm: use old checksum for Bz A-step")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20231017115047.e37327f1a129.Iaee86b00db4db791cd90adaf15384b8c87d2ad49@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a32973ee

drivers/net/wireless/intel/iwlwifi/cfg/bz.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ const struct iwl_cfg iwl_cfg_bz = { 
	.fw_name_mac = "bz",

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_EHT,

};
@@ -166,7 +166,7 @@ const struct iwl_cfg iwl_cfg_gl = { 
	.fw_name_mac = "gl",

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_EHT,

};

drivers/net/wireless/intel/iwlwifi/cfg/sc.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ const struct iwl_cfg iwl_cfg_sc = { 
	.fw_name_mac = "sc",

	.uhb_supported = true,

	IWL_DEVICE_SC,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_SC_EHT,

};

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

+1 −4
Original line number Diff line number Diff line
@@ -86,10 +86,7 @@ enum iwl_nvm_type { 
#define IWL_DEFAULT_MAX_TX_POWER 22

#define IWL_TX_CSUM_NETIF_FLAGS (NETIF_F_IPV6_CSUM | NETIF_F_IP_CSUM |\

				 NETIF_F_TSO | NETIF_F_TSO6)

#define IWL_TX_CSUM_NETIF_FLAGS_BZ (NETIF_F_HW_CSUM | NETIF_F_TSO | NETIF_F_TSO6)

#define IWL_CSUM_NETIF_FLAGS_MASK (IWL_TX_CSUM_NETIF_FLAGS | \

				   IWL_TX_CSUM_NETIF_FLAGS_BZ | \

				   NETIF_F_RXCSUM)

#define IWL_CSUM_NETIF_FLAGS_MASK (IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM)



/* Antenna presence definitions */

#define	ANT_NONE	0x0