From: David S. Miller <davem@davemloft.net>
Date: Fri, 2 Oct 2020 20:36:07 +0000 (-0700)
Subject: Merge branch 'net-dsa-Improve-dsa_untag_bridge_pvid'
X-Git-Tag: Ubuntu-5.13.0-19.19~4830^2~87
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cb307c2d845d823da206dcaca80edb71ff9e6bc4;p=mirror_ubuntu-jammy-kernel.git

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>
---

cb307c2d845d823da206dcaca80edb71ff9e6bc4