diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-11 05:33:51 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-11 05:33:52 +0300 |
| commit | cddd2dc6390b90e62cec2768424d1d90f6d04161 (patch) | |
| tree | dc3a12a6f8fd3dda77400a00e3fcc3f94ba53060 /drivers/net/ethernet/intel/ice/ice_eswitch.c | |
| parent | 24e28b60b0649b3e84d81a6e7e1094c5b1f52842 (diff) | |
| parent | 6918107e25407ed0b5846af70449547263dcfef0 (diff) | |
| download | linux-cddd2dc6390b90e62cec2768424d1d90f6d04161.tar.xz | |
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
Tony Nguyen says:
====================
Intel Wired LAN Driver Updates 2024-05-08 (most Intel drivers)
This series contains updates to i40e, iavf, ice, igb, igc, e1000e, and ixgbe
drivers.
Asbjørn Sloth Tønnesen adds checks against supported flower control flags
for i40e, iavf, ice, and igb drivers.
Michal corrects filters removed during eswitch release for ice.
Corinna Vinschen defers PTP initialization to later in probe so that
netdev log entry is initialized on igc.
Ilpo Järvinen removes a couple of unused, duplicate defines on
e1000e and ixgbe.
* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates
igc: fix a log entry using uninitialized netdev
ice: remove correct filters during eswitch release
igb: flower: validate control flags
ice: flower: validate control flags
iavf: flower: validate control flags
i40e: flower: validate control flags
====================
Link: https://lore.kernel.org/r/20240508173342.2760994-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_eswitch.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_eswitch.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.c b/drivers/net/ethernet/intel/ice/ice_eswitch.c index c902848cf88e..b102db8b829a 100644 --- a/drivers/net/ethernet/intel/ice/ice_eswitch.c +++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c @@ -246,7 +246,10 @@ static void ice_eswitch_release_env(struct ice_pf *pf) ice_vsi_update_local_lb(uplink_vsi, false); ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override); vlan_ops->ena_rx_filtering(uplink_vsi); - ice_clear_dflt_vsi(uplink_vsi); + ice_cfg_dflt_vsi(uplink_vsi->port_info, uplink_vsi->idx, false, + ICE_FLTR_TX); + ice_cfg_dflt_vsi(uplink_vsi->port_info, uplink_vsi->idx, false, + ICE_FLTR_RX); ice_fltr_add_mac_and_broadcast(uplink_vsi, uplink_vsi->port_info->mac.perm_addr, ICE_FWD_TO_VSI); |