]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'net-dsa-Improve-dsa_untag_bridge_pvid'
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Oct 2020 20:36:07 +0000 (13:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Oct 2020 20:36:07 +0000 (13:36 -0700)
commitcb307c2d845d823da206dcaca80edb71ff9e6bc4
treea75b5229db47acc061133db3c00e7825d32e40f9
parentc16bcd70a11b52d20877aa4e0b59285690a1b268
parent3a68844dd2d8b3fd23f92894b6628e02a530b445
Merge branch 'net-dsa-Improve-dsa_untag_bridge_pvid'

Florian Fainelli says:

====================
net: dsa: Improve dsa_untag_bridge_pvid()

This patch series is based on the recent discussions with Vladimir:

https://lore.kernel.org/netdev/20201001030623.343535-1-f.fainelli@gmail.com/

the simplest way forward was to call dsa_untag_bridge_pvid() after
eth_type_trans() has been set which guarantees that skb->protocol is set
to a correct value and this allows us to utilize
__vlan_find_dev_deep_rcu() properly without playing or using the bridge
master as a net_device reference.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>