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

staging: dpaa2-ethsw: setup the STP state for all installed VLANs

Setup the STP state for all VLANs installed on the port. This is also
avoiding the error situation when the DEFAULT_VLAN_ID is not installed
on the port (thus the firmware complains that it cannot setup the
required STP state).
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Link: https://lore.kernel.org/r/20200721091919.20394-4-ioana.ciornei@nxp.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af85d0e0
...@@ -183,21 +183,26 @@ static int ethsw_port_set_flood(struct ethsw_port_priv *port_priv, bool enable) ...@@ -183,21 +183,26 @@ static int ethsw_port_set_flood(struct ethsw_port_priv *port_priv, bool enable)
static int ethsw_port_set_stp_state(struct ethsw_port_priv *port_priv, u8 state) static int ethsw_port_set_stp_state(struct ethsw_port_priv *port_priv, u8 state)
{ {
struct dpsw_stp_cfg stp_cfg = { struct dpsw_stp_cfg stp_cfg = {
.vlan_id = DEFAULT_VLAN_ID,
.state = state, .state = state,
}; };
int err; int err;
u16 vid;
if (!netif_running(port_priv->netdev) || state == port_priv->stp_state) if (!netif_running(port_priv->netdev) || state == port_priv->stp_state)
return 0; /* Nothing to do */ return 0; /* Nothing to do */
err = dpsw_if_set_stp(port_priv->ethsw_data->mc_io, 0, for (vid = 0; vid <= VLAN_VID_MASK; vid++) {
port_priv->ethsw_data->dpsw_handle, if (port_priv->vlans[vid] & ETHSW_VLAN_MEMBER) {
port_priv->idx, &stp_cfg); stp_cfg.vlan_id = vid;
if (err) { err = dpsw_if_set_stp(port_priv->ethsw_data->mc_io, 0,
netdev_err(port_priv->netdev, port_priv->ethsw_data->dpsw_handle,
"dpsw_if_set_stp err %d\n", err); port_priv->idx, &stp_cfg);
return err; if (err) {
netdev_err(port_priv->netdev,
"dpsw_if_set_stp err %d\n", err);
return err;
}
}
} }
port_priv->stp_state = state; port_priv->stp_state = state;
......
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