Checks
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | warning | coding style issues |
Commit Message
Burakov, Anatoly
June 12, 2024, 3:01 p.m. UTC
From: Ian Stokes <ian.stokes@intel.com> Added sw_id variables to ice_fltr_info struct and disable lan_en flag for Floating VEB VSIs. Signed-off-by: Pawel Sobczyk <pawel.sobczyk@intel.com> Signed-off-by: Ian Stokes <ian.stokes@intel.com> --- drivers/net/ice/base/ice_switch.c | 6 ++++-- drivers/net/ice/base/ice_switch.h | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 051cf087f5..2992b733c9 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -4153,8 +4153,10 @@ static void ice_fill_sw_info(struct ice_hw *hw, struct ice_fltr_info *fi) (fi->lkup_type == ICE_SW_LKUP_MAC && !IS_UNICAST_ETHER_ADDR(fi->l_data.mac.mac_addr)) || (fi->lkup_type == ICE_SW_LKUP_MAC_VLAN && - !IS_UNICAST_ETHER_ADDR(fi->l_data.mac.mac_addr))) - fi->lan_en = true; + !IS_UNICAST_ETHER_ADDR(fi->l_data.mac.mac_addr))) { + if (!fi->fltVeb_en) + fi->lan_en = true; + } } else { fi->lan_en = true; } diff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h index 939fa6df3c..bba1149528 100644 --- a/drivers/net/ice/base/ice_switch.h +++ b/drivers/net/ice/base/ice_switch.h @@ -146,6 +146,7 @@ struct ice_fltr_info { union { struct { u8 mac_addr[ETH_ALEN]; + u16 sw_id; } mac; struct { u8 mac_addr[ETH_ALEN]; @@ -155,6 +156,7 @@ struct ice_fltr_info { u16 vlan_id; u16 tpid; u8 tpid_valid; + u16 sw_id; } vlan; /* Set lkup_type as ICE_SW_LKUP_ETHERTYPE * if just using ethertype as filter. Set lkup_type as @@ -192,6 +194,7 @@ struct ice_fltr_info { /* Rule creations populate these indicators basing on the switch type */ u8 lb_en; /* Indicate if packet can be looped back */ u8 lan_en; /* Indicate if packet can be forwarded to the uplink */ + u8 fltVeb_en; /* Indicate if VSI is connected to floating VEB */ }; struct ice_update_recipe_lkup_idx_params {