diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-15 17:29:56 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-15 17:30:49 +0300 |
| commit | 621cde16e49b3ecf7d59a8106a20aaebfb4a59a9 (patch) | |
| tree | bb4b8e255e276950c8d9502998f83a7f4f5bf5e9 /drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c | |
| parent | 317a215d493230da361028ea8a4675de334bfa1a (diff) | |
| parent | 1b294a1f35616977caddaddf3e9d28e576a1adbc (diff) | |
| download | linux-621cde16e49b3ecf7d59a8106a20aaebfb4a59a9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
Cross merge.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c')
| -rw-r--r-- | drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c b/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c index 3c44660128da..fa34a739c748 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c @@ -157,7 +157,7 @@ void lan966x_vlan_port_apply(struct lan966x_port *port) pvid = lan966x_vlan_port_get_pvid(port); - /* Ingress clasification (ANA_PORT_VLAN_CFG) */ + /* Ingress classification (ANA_PORT_VLAN_CFG) */ /* Default vlan to classify for untagged frames (may be zero) */ val = ANA_VLAN_CFG_VLAN_VID_SET(pvid); if (port->vlan_aware) |