From 44a87aa9c2c89af075cec0f4eedf6ddd7c829088 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Sat, 24 Apr 2021 14:03:34 +0800 Subject: [PATCH] common/iavf: fix duplicated offload bit The value of offload VIRTCHNL_VF_OFFLOAD_CRC bit already existed as VIRTCHNL_VF_CAP_ADV_LINK_SPEED. Fix this now by changing the value of VIRTCHNL_VF_OFFLOAD_CRC to a currently unused value. Also, move the define for VIRTCHNL_VF_CAP_ADV_LINK_SPEED in the correct place to line up with the other bit values and add a comment for its purpose. Hopefully this will prevent from defining duplicate bits moving forward. Fixes: e244eeafcecb ("net/iavf/base: update virtual channel") Cc: stable@dpdk.org Signed-off-by: Brett Creeley Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- drivers/common/iavf/virtchnl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h index 139569787f..c68128f773 100644 --- a/drivers/common/iavf/virtchnl.h +++ b/drivers/common/iavf/virtchnl.h @@ -372,9 +372,11 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource); #define VIRTCHNL_VF_OFFLOAD_RSS_REG 0x00000010 #define VIRTCHNL_VF_OFFLOAD_WB_ON_ITR 0x00000020 #define VIRTCHNL_VF_OFFLOAD_REQ_QUEUES 0x00000040 -#define VIRTCHNL_VF_OFFLOAD_CRC 0x00000080 +/* used to negotiate communicating link speeds in Mbps */ +#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x00000080 /* 0X00000100 is reserved */ #define VIRTCHNL_VF_LARGE_NUM_QPAIRS 0x00000200 +#define VIRTCHNL_VF_OFFLOAD_CRC 0x00000400 #define VIRTCHNL_VF_OFFLOAD_VLAN_V2 0x00008000 #define VIRTCHNL_VF_OFFLOAD_VLAN 0x00010000 #define VIRTCHNL_VF_OFFLOAD_RX_POLLING 0x00020000 @@ -393,8 +395,6 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource); #define VIRTCHNL_VF_CAP_DCF 0X40000000 /* 0X80000000 is reserved */ -/* Define below the capability flags that are not offloads */ -#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x00000080 #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \ VIRTCHNL_VF_OFFLOAD_VLAN | \ VIRTCHNL_VF_OFFLOAD_RSS_PF) -- 2.20.1