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: Ioana Ciornei <ioana.ciornei@nxp.com>
Link: https://lore.kernel.org/r/20200721091919.20394-3-ioana.ciornei@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ioana Ciornei 2020-07-21 12:19:15 +03:00 committed by Greg Kroah-Hartman
parent b99a3f7093
commit af85d0e06c

View File

@ -1182,6 +1182,9 @@ static int port_bridge_join(struct net_device *netdev,
{
struct ethsw_port_priv *port_priv = netdev_priv(netdev);
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;
for (i = 0; i < ethsw->sw_attr.num_ifs; i++)
@ -1192,6 +1195,18 @@ static int port_bridge_join(struct net_device *netdev,
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 */
err = ethsw_port_set_flood(port_priv, 1);
if (!err)