Skip to content

Commit 4a15022

Browse files
bcreeley13anguy11
authored andcommitted
virtchnl: Use the BIT() macro for capability/offload flags
Currently raw hex values are used to define specific bits for each capability/offload in virtchnl.h. Using raw hex values makes it unclear which bits are used/available. Fix this by using the BIT() macro so it's immediately obvious which bits are used/available. Also, move the VIRTCHNL_VF_CAP_ADV_LINK_SPEED define in the correct place to line up with the other bit values and add a comment for its purpose. Signed-off-by: Brett Creeley <[email protected]> Tested-by: Tony Brelinski <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 5bf84b2 commit 4a15022

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

include/linux/avf/virtchnl.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -238,26 +238,26 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
238238
* VIRTCHNL_VF_OFFLOAD_L2 flag is inclusive of base mode L2 offloads including
239239
* TX/RX Checksum offloading and TSO for non-tunnelled packets.
240240
*/
241-
#define VIRTCHNL_VF_OFFLOAD_L2 0x00000001
242-
#define VIRTCHNL_VF_OFFLOAD_IWARP 0x00000002
243-
#define VIRTCHNL_VF_OFFLOAD_RSS_AQ 0x00000008
244-
#define VIRTCHNL_VF_OFFLOAD_RSS_REG 0x00000010
245-
#define VIRTCHNL_VF_OFFLOAD_WB_ON_ITR 0x00000020
246-
#define VIRTCHNL_VF_OFFLOAD_REQ_QUEUES 0x00000040
247-
#define VIRTCHNL_VF_OFFLOAD_VLAN 0x00010000
248-
#define VIRTCHNL_VF_OFFLOAD_RX_POLLING 0x00020000
249-
#define VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 0x00040000
250-
#define VIRTCHNL_VF_OFFLOAD_RSS_PF 0X00080000
251-
#define VIRTCHNL_VF_OFFLOAD_ENCAP 0X00100000
252-
#define VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM 0X00200000
253-
#define VIRTCHNL_VF_OFFLOAD_RX_ENCAP_CSUM 0X00400000
254-
#define VIRTCHNL_VF_OFFLOAD_ADQ 0X00800000
255-
#define VIRTCHNL_VF_OFFLOAD_USO 0X02000000
256-
#define VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF 0X08000000
257-
#define VIRTCHNL_VF_OFFLOAD_FDIR_PF 0X10000000
258-
259-
/* Define below the capability flags that are not offloads */
260-
#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x00000080
241+
#define VIRTCHNL_VF_OFFLOAD_L2 BIT(0)
242+
#define VIRTCHNL_VF_OFFLOAD_IWARP BIT(1)
243+
#define VIRTCHNL_VF_OFFLOAD_RSS_AQ BIT(3)
244+
#define VIRTCHNL_VF_OFFLOAD_RSS_REG BIT(4)
245+
#define VIRTCHNL_VF_OFFLOAD_WB_ON_ITR BIT(5)
246+
#define VIRTCHNL_VF_OFFLOAD_REQ_QUEUES BIT(6)
247+
/* used to negotiate communicating link speeds in Mbps */
248+
#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED BIT(7)
249+
#define VIRTCHNL_VF_OFFLOAD_VLAN BIT(16)
250+
#define VIRTCHNL_VF_OFFLOAD_RX_POLLING BIT(17)
251+
#define VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 BIT(18)
252+
#define VIRTCHNL_VF_OFFLOAD_RSS_PF BIT(19)
253+
#define VIRTCHNL_VF_OFFLOAD_ENCAP BIT(20)
254+
#define VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM BIT(21)
255+
#define VIRTCHNL_VF_OFFLOAD_RX_ENCAP_CSUM BIT(22)
256+
#define VIRTCHNL_VF_OFFLOAD_ADQ BIT(23)
257+
#define VIRTCHNL_VF_OFFLOAD_USO BIT(25)
258+
#define VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF BIT(27)
259+
#define VIRTCHNL_VF_OFFLOAD_FDIR_PF BIT(28)
260+
261261
#define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \
262262
VIRTCHNL_VF_OFFLOAD_VLAN | \
263263
VIRTCHNL_VF_OFFLOAD_RSS_PF)

0 commit comments

Comments
 (0)