Commit 4acfee81 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller

net: dsa: add port STP state helper

Add a void helper to set the STP state of a port, checking first if the
required routine is provided by the driver.
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3978673
...@@ -69,6 +69,12 @@ static inline bool dsa_port_is_bridged(struct dsa_slave_priv *p) ...@@ -69,6 +69,12 @@ static inline bool dsa_port_is_bridged(struct dsa_slave_priv *p)
return !!p->bridge_dev; return !!p->bridge_dev;
} }
static void dsa_port_set_stp_state(struct dsa_switch *ds, int port, u8 state)
{
if (ds->ops->port_stp_state_set)
ds->ops->port_stp_state_set(ds, port, state);
}
static int dsa_slave_open(struct net_device *dev) static int dsa_slave_open(struct net_device *dev)
{ {
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
...@@ -104,8 +110,7 @@ static int dsa_slave_open(struct net_device *dev) ...@@ -104,8 +110,7 @@ static int dsa_slave_open(struct net_device *dev)
goto clear_promisc; goto clear_promisc;
} }
if (ds->ops->port_stp_state_set) dsa_port_set_stp_state(ds, p->port, stp_state);
ds->ops->port_stp_state_set(ds, p->port, stp_state);
if (p->phy) if (p->phy)
phy_start(p->phy); phy_start(p->phy);
...@@ -147,8 +152,7 @@ static int dsa_slave_close(struct net_device *dev) ...@@ -147,8 +152,7 @@ static int dsa_slave_close(struct net_device *dev)
if (ds->ops->port_disable) if (ds->ops->port_disable)
ds->ops->port_disable(ds, p->port, p->phy); ds->ops->port_disable(ds, p->port, p->phy);
if (ds->ops->port_stp_state_set) dsa_port_set_stp_state(ds, p->port, BR_STATE_DISABLED);
ds->ops->port_stp_state_set(ds, p->port, BR_STATE_DISABLED);
return 0; return 0;
} }
...@@ -354,7 +358,7 @@ static int dsa_slave_stp_state_set(struct net_device *dev, ...@@ -354,7 +358,7 @@ static int dsa_slave_stp_state_set(struct net_device *dev,
if (switchdev_trans_ph_prepare(trans)) if (switchdev_trans_ph_prepare(trans))
return ds->ops->port_stp_state_set ? 0 : -EOPNOTSUPP; return ds->ops->port_stp_state_set ? 0 : -EOPNOTSUPP;
ds->ops->port_stp_state_set(ds, p->port, attr->u.stp_state); dsa_port_set_stp_state(ds, p->port, attr->u.stp_state);
return 0; return 0;
} }
...@@ -556,8 +560,7 @@ static void dsa_slave_bridge_port_leave(struct net_device *dev) ...@@ -556,8 +560,7 @@ static void dsa_slave_bridge_port_leave(struct net_device *dev)
/* Port left the bridge, put in BR_STATE_DISABLED by the bridge layer, /* Port left the bridge, put in BR_STATE_DISABLED by the bridge layer,
* so allow it to be in BR_STATE_FORWARDING to be kept functional * so allow it to be in BR_STATE_FORWARDING to be kept functional
*/ */
if (ds->ops->port_stp_state_set) dsa_port_set_stp_state(ds, p->port, BR_STATE_FORWARDING);
ds->ops->port_stp_state_set(ds, p->port, BR_STATE_FORWARDING);
} }
static int dsa_slave_port_attr_get(struct net_device *dev, static int dsa_slave_port_attr_get(struct net_device *dev,
......
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