ice: Rename enum ice_pkt_flags values

enum ice_pkt_flags contains values such as ICE_PKT_FLAGS_VLAN and
ICE_PKT_FLAGS_TUNNEL, but actually the flags words which they refer to
contain a range of unrelated values - e.g. word 0 (ICE_PKT_FLAGS_VLAN)
contains fields such as from_network and ucast, which have nothing to do
with VLAN. Rename each enum value to ICE_PKT_FLAGS_MDID<number>, so it's
clear in which flags word does some value reside.

Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_protocol_type.h b/drivers/net/ethernet/intel/ice/ice_protocol_type.h
index 9812b98d107fda75e6eb0be122b841ae7fd032b6..f6f27361c3cf7fd9d55b0c5be933fbf347a3f4f0 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_protocol_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_protocol_type.h
@@ -393,10 +393,10 @@ enum ice_hw_metadata_offset {
 };
 
 enum ice_pkt_flags {
-       ICE_PKT_FLAGS_VLAN = 0,
-       ICE_PKT_FLAGS_TUNNEL = 1,
-       ICE_PKT_FLAGS_TCP = 2,
-       ICE_PKT_FLAGS_ERROR = 3,
+       ICE_PKT_FLAGS_MDID20 = 0,
+       ICE_PKT_FLAGS_MDID21 = 1,
+       ICE_PKT_FLAGS_MDID22 = 2,
+       ICE_PKT_FLAGS_MDID23 = 3,
 };
 
 struct ice_hw_metadata {

diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index dcbb69bc9f5accef96be29cbbb3cc88c3b181293..a7afb612fe32e7a20a19803db6cd8479daa19cb2 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -6058,21 +6058,21 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
 void ice_rule_add_tunnel_metadata(struct ice_adv_lkup_elem *lkup)
 {
        lkup->type = ICE_HW_METADATA;
-       lkup->m_u.metadata.flags[ICE_PKT_FLAGS_TUNNEL] |=
+       lkup->m_u.metadata.flags[ICE_PKT_FLAGS_MDID21] |=
                cpu_to_be16(ICE_PKT_TUNNEL_MASK);
 }
 
 void ice_rule_add_direction_metadata(struct ice_adv_lkup_elem *lkup)
 {
        lkup->type = ICE_HW_METADATA;
-       lkup->m_u.metadata.flags[ICE_PKT_FLAGS_VLAN] |=
+       lkup->m_u.metadata.flags[ICE_PKT_FLAGS_MDID20] |=
                cpu_to_be16(ICE_PKT_FROM_NETWORK);
 }
 
 void ice_rule_add_vlan_metadata(struct ice_adv_lkup_elem *lkup)
 {
        lkup->type = ICE_HW_METADATA;
-       lkup->m_u.metadata.flags[ICE_PKT_FLAGS_VLAN] |=
+       lkup->m_u.metadata.flags[ICE_PKT_FLAGS_MDID20] |=
                cpu_to_be16(ICE_PKT_VLAN_MASK);
 }