[PATCH net 1/2] Revert "net: dsa: fix SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING getting ignored"
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: 2021-03-06 00:27:56
Subsystem:
networking [dsa], networking [general], the rest · Maintainers:
Andrew Lunn, Vladimir Oltean, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
This reverts commit 99b8202b179fc3dbbca69e8af6da660224c9d676. DSA should indeed react to certain switchdev attributes where orig_dev is the bridge master. But the fix was too broad, causing the driver to misinterpret VLAN objects added to the bridge master as objects added to the ports. Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com> --- net/dsa/dsa_priv.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 2eeaa42f2e08..d40dfede494c 100644
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h@@ -236,15 +236,7 @@ static inline bool dsa_port_offloads_netdev(struct dsa_port *dp, /* Switchdev offloading can be configured on: */ if (dev == dp->slave) - /* DSA ports directly connected to a bridge, and event - * was emitted for the ports themselves. - */ - return true; - - if (dp->bridge_dev == dev) - /* DSA ports connected to a bridge, and event was emitted - * for the bridge. - */ + /* DSA ports directly connected to a bridge. */ return true; if (dp->lag_dev == dev)
--
2.25.1