]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
net: enetc: fix incorrect TPID when receiving 802.1ad tagged packets
authorVladimir Oltean <vladimir.oltean@nxp.com>
Mon, 1 Mar 2021 11:18:14 +0000 (13:18 +0200)
committerSeth Forshee <seth.forshee@canonical.com>
Wed, 17 Mar 2021 18:37:40 +0000 (13:37 -0500)
commita5f8aac3417b1857819212c72f5a3c46b4dc979d
treede3eb4664ad5023c4abd33ede1a5f7af146f5395
parenta797d360b0b51140f045c3aa2abbb800fc4cd0b2
net: enetc: fix incorrect TPID when receiving 802.1ad tagged packets

BugLink: https://bugs.launchpad.net/bugs/1919492
commit 827b6fd046516af605e190c872949f22208b5d41 upstream.

When the enetc ports have rx-vlan-offload enabled, they report a TPID of
ETH_P_8021Q regardless of what was actually in the packet. When
rx-vlan-offload is disabled, packets have the proper TPID. Fix this
inconsistency by finishing the TODO left in the code.

Fixes: d4fd0404c1c9 ("enetc: Introduce basic PF and VF ENETC ethernet drivers")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/net/ethernet/freescale/enetc/enetc.c
drivers/net/ethernet/freescale/enetc/enetc_hw.h