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

Commit 9d68322e authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40evf: disable unused flags 



The i40evf hardware doesn't have any way to ever report FCoE enabled
so just force the code to always report FCoE is disabled, remove the
unused defines, and mark the OP as reserved.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 155b0f69

drivers/net/ethernet/intel/i40evf/i40e_common.c

+1 −2
Original line number Diff line number Diff line
@@ -1105,8 +1105,7 @@ void i40e_vf_parse_hw_config(struct i40e_hw *hw, 
	hw->dev_caps.num_msix_vectors_vf = msg->max_vectors;

	hw->dev_caps.dcb = msg->vf_offload_flags &

			   I40E_VIRTCHNL_VF_OFFLOAD_L2;

	hw->dev_caps.fcoe = (msg->vf_offload_flags &

			     I40E_VIRTCHNL_VF_OFFLOAD_FCOE) ? 1 : 0;

	hw->dev_caps.fcoe = 0;

	for (i = 0; i < msg->num_vsis; i++) {

		if (vsi_res->vsi_type == I40E_VSI_SRIOV) {

			ether_addr_copy(hw->mac.perm_addr,

drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h

+1 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ enum i40e_virtchnl_ops { 
	I40E_VIRTCHNL_OP_DEL_VLAN = 13,

	I40E_VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE = 14,

	I40E_VIRTCHNL_OP_GET_STATS = 15,

	I40E_VIRTCHNL_OP_FCOE = 16,

	I40E_VIRTCHNL_OP_RSVD = 16,

	I40E_VIRTCHNL_OP_EVENT = 17, /* must ALWAYS be 17 */

	I40E_VIRTCHNL_OP_IWARP = 20,

	I40E_VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP = 21,
@@ -155,7 +155,6 @@ struct i40e_virtchnl_vsi_resource { 
/* VF offload flags */

#define I40E_VIRTCHNL_VF_OFFLOAD_L2		0x00000001

#define I40E_VIRTCHNL_VF_OFFLOAD_IWARP		0x00000002

#define I40E_VIRTCHNL_VF_OFFLOAD_FCOE		0x00000004

#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_AQ		0x00000008

#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_REG	0x00000010

#define I40E_VIRTCHNL_VF_OFFLOAD_WB_ON_ITR	0x00000020