diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2022-08-19 20:48:14 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-08-23 11:39:22 +0200 |
| commit | 920a33cd72314f4ea96b5224fa8c7d4472d81880 (patch) | |
| tree | 3cb215812eb253d9f8c9388078e2e512eaa29d3d /net/bridge | |
| parent | 0498277ee17bb40cef43e0c9064b06c25f9bda29 (diff) | |
| download | linux-stable-920a33cd72314f4ea96b5224fa8c7d4472d81880.tar.gz linux-stable-920a33cd72314f4ea96b5224fa8c7d4472d81880.tar.bz2 linux-stable-920a33cd72314f4ea96b5224fa8c7d4472d81880.zip | |
net: bridge: move DSA master bridging restriction to DSA
When DSA gains support for multiple CPU ports in a LAG, it will become
mandatory to monitor the changeupper events for the DSA master.
In fact, there are already some restrictions to be imposed in that area,
namely that a DSA master cannot be a bridge port except in some special
circumstances.
Centralize the restrictions at the level of the DSA layer as a
preliminary step.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_if.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index a84a7cfb9d6d..efbd93e92ce2 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -568,26 +568,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, !is_valid_ether_addr(dev->dev_addr)) return -EINVAL; - /* Also don't allow bridging of net devices that are DSA masters, since - * the bridge layer rx_handler prevents the DSA fake ethertype handler - * to be invoked, so we don't get the chance to strip off and parse the - * DSA switch tag protocol header (the bridge layer just returns - * RX_HANDLER_CONSUMED, stopping RX processing for these frames). - * The only case where that would not be an issue is when bridging can - * already be offloaded, such as when the DSA master is itself a DSA - * or plain switchdev port, and is bridged only with other ports from - * the same hardware device. - */ - if (netdev_uses_dsa(dev)) { - list_for_each_entry(p, &br->port_list, list) { - if (!netdev_port_same_parent_id(dev, p->dev)) { - NL_SET_ERR_MSG(extack, - "Cannot do software bridging with a DSA master"); - return -EINVAL; - } - } - } - /* No bridging of bridges */ if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit) { NL_SET_ERR_MSG(extack, |