Commit 41ad9f8e authored by Marcin Szycik's avatar Marcin Szycik Committed by Tony Nguyen
Browse files

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: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 0960a27b

drivers/net/ethernet/intel/ice/ice_protocol_type.h

+4 −4
Original line number Diff line number Diff line
@@ -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 {

drivers/net/ethernet/intel/ice/ice_switch.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}