diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2015-09-29 14:17:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-29 21:36:01 -0700 |
| commit | 57a47532c4312159935c98b7f1cf0e62296b9171 (patch) | |
| tree | 81b53ee9607a5f3f1536b08314bab337f8695012 /net/dsa | |
| parent | 9ae6d4935e3df35a23bbbe531c6b9ff314e7fd0f (diff) | |
| download | linux-stable-57a47532c4312159935c98b7f1cf0e62296b9171.tar.gz linux-stable-57a47532c4312159935c98b7f1cf0e62296b9171.tar.bz2 linux-stable-57a47532c4312159935c98b7f1cf0e62296b9171.zip | |
net: dsa: fix preparation of a port STP update
Because of the default 0 value of ret in dsa_slave_port_attr_set, a
driver may return -EOPNOTSUPP from the commit phase of a STP state,
which triggers a WARN() from switchdev.
This happened on a 6185 switch which does not support hardware bridging.
Fixes: 3563606258cf ("switchdev: convert STP update to switchdev attr set")
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index cce97385f743..7d91f4612ac0 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -458,12 +458,17 @@ static int dsa_slave_stp_update(struct net_device *dev, u8 state) static int dsa_slave_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) { - int ret = 0; + struct dsa_slave_priv *p = netdev_priv(dev); + struct dsa_switch *ds = p->parent; + int ret; switch (attr->id) { case SWITCHDEV_ATTR_PORT_STP_STATE: - if (attr->trans == SWITCHDEV_TRANS_COMMIT) - ret = dsa_slave_stp_update(dev, attr->u.stp_state); + if (attr->trans == SWITCHDEV_TRANS_PREPARE) + ret = ds->drv->port_stp_update ? 0 : -EOPNOTSUPP; + else + ret = ds->drv->port_stp_update(ds, p->port, + attr->u.stp_state); break; default: ret = -EOPNOTSUPP; |