Commit af85d0e0 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Greg Kroah-Hartman

staging: dpaa2-ethsw: don't allow interfaces from different DPSWs to be bridged

Error out when the user tries to bridge two switch interfaces that are
from different DPSW instances. This is not supported by the hardware and
we should reflect this into what the user is aware of.
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Link: https://lore.kernel.org/r/20200721091919.20394-3-ioana.ciornei@nxp.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b99a3f70
...@@ -1182,6 +1182,9 @@ static int port_bridge_join(struct net_device *netdev, ...@@ -1182,6 +1182,9 @@ static int port_bridge_join(struct net_device *netdev,
{ {
struct ethsw_port_priv *port_priv = netdev_priv(netdev); struct ethsw_port_priv *port_priv = netdev_priv(netdev);
struct ethsw_core *ethsw = port_priv->ethsw_data; struct ethsw_core *ethsw = port_priv->ethsw_data;
struct ethsw_port_priv *other_port_priv;
struct net_device *other_dev;
struct list_head *iter;
int i, err; int i, err;
for (i = 0; i < ethsw->sw_attr.num_ifs; i++) for (i = 0; i < ethsw->sw_attr.num_ifs; i++)
...@@ -1192,6 +1195,18 @@ static int port_bridge_join(struct net_device *netdev, ...@@ -1192,6 +1195,18 @@ static int port_bridge_join(struct net_device *netdev,
return -EINVAL; return -EINVAL;
} }
netdev_for_each_lower_dev(upper_dev, other_dev, iter) {
if (!ethsw_port_dev_check(other_dev, NULL))
continue;
other_port_priv = netdev_priv(other_dev);
if (other_port_priv->ethsw_data != port_priv->ethsw_data) {
netdev_err(netdev,
"Interface from a different DPSW is in the bridge already!\n");
return -EINVAL;
}
}
/* Enable flooding */ /* Enable flooding */
err = ethsw_port_set_flood(port_priv, 1); err = ethsw_port_set_flood(port_priv, 1);
if (!err) if (!err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment