mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

ice: Rename enum ice_pkt_flags values

Browse source 
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>
This commit is contained in:
Marcin Szycik 2023-06-22 15:35:13 +02:00 committed by Tony Nguyen
parent 0960a27bd4
commit 41ad9f8ee6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/ethernet/intel/ice/ice_protocol_type.h
View file

@ -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 {

6
drivers/net/ethernet/intel/ice/ice_switch.c
View file

@ -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);
}