diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2022-12-13 14:28:47 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-12-13 14:28:47 +0100 |
| commit | ab970ae1d63822228bdc84b9c1514efbd2f66da7 (patch) | |
| tree | fefc08d8dd28e4eb5465ca85de5cce2fb6f1b7ef /drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c | |
| parent | cfd1f6c16f7deadfe5269a76c1516405c4466481 (diff) | |
| parent | 163a7fbff7a78c7c055e6c0ad26124ae551fe313 (diff) | |
| download | linux-ab970ae1d63822228bdc84b9c1514efbd2f66da7.tar.bz2 | |
Merge branch 'for-6.2/default-remove-cleanup' into for-linus
- removal of superfluous hid_hw_stop() calls for drivers with default
.remove callback (Marcus Folkesson)
Diffstat (limited to 'drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c')
| -rw-r--r-- | drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c b/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c index 8d7260cd7da9..3c44660128da 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c @@ -169,6 +169,12 @@ void lan966x_vlan_port_apply(struct lan966x_port *port) ANA_VLAN_CFG_VLAN_POP_CNT, lan966x, ANA_VLAN_CFG(port->chip_port)); + lan_rmw(DEV_MAC_TAGS_CFG_VLAN_AWR_ENA_SET(port->vlan_aware) | + DEV_MAC_TAGS_CFG_VLAN_DBL_AWR_ENA_SET(port->vlan_aware), + DEV_MAC_TAGS_CFG_VLAN_AWR_ENA | + DEV_MAC_TAGS_CFG_VLAN_DBL_AWR_ENA, + lan966x, DEV_MAC_TAGS_CFG(port->chip_port)); + /* Drop frames with multicast source address */ val = ANA_DROP_CFG_DROP_MC_SMAC_ENA_SET(1); if (port->vlan_aware && !pvid) |