diff options
| author | Paolo Abeni <[email protected]> | 2022-08-03 06:50:42 +0000 |
|---|---|---|
| committer | Paolo Abeni <[email protected]> | 2022-08-03 07:04:55 +0000 |
| commit | 7c6327c77d509e78bff76f2a4551fcfee851682e (patch) | |
| tree | 9e5e128945eadd50462620927ed915fb88fb6eb1 /drivers/net/ethernet/intel/ice/ice_main.c | |
| parent | doc: sfp-phylink: Fix a broken reference (diff) | |
| parent | net/mlx5e: xsk: Discard unaligned XSK frames on striding RQ (diff) | |
| download | kernel-7c6327c77d509e78bff76f2a4551fcfee851682e.tar.gz kernel-7c6327c77d509e78bff76f2a4551fcfee851682e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
net/ax25/af_ax25.c
d7c4c9e075f8c ("ax25: fix incorrect dev_tracker usage")
d62607c3fe459 ("net: rename reference+tracking helpers")
drivers/net/netdevsim/fib.c
180a6a3ee60a ("netdevsim: fib: Fix reference count leak on route deletion failure")
012ec02ae441 ("netdevsim: convert driver to use unlocked devlink API during init/fini")
Signed-off-by: Paolo Abeni <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 9a3b14d42835..eb40526ee179 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -433,7 +433,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) IFF_PROMISC; goto out_promisc; } - if (vsi->current_netdev_flags & + if (vsi->netdev->features & NETIF_F_HW_VLAN_CTAG_FILTER) vlan_ops->ena_rx_filtering(vsi); } |