diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2015-09-29 12:38:36 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-09-29 21:35:06 -0700 |
| commit | b8d866ac6aa45147b84f3f67b124b82bee675e9f (patch) | |
| tree | 9a40533604c7b4287c57d02ad67a26f431de63c3 /net/dsa | |
| parent | net: Add support for filtering neigh dump by master device (diff) | |
| download | linux-dev-b8d866ac6aa45147b84f3f67b124b82bee675e9f.tar.xz linux-dev-b8d866ac6aa45147b84f3f67b124b82bee675e9f.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.
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
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 04f01535d2b6..7b1d9ec74e09 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -453,12 +453,17 @@ static int dsa_slave_port_attr_set(struct net_device *dev, struct switchdev_attr *attr, struct switchdev_trans *trans) { - 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 (switchdev_trans_ph_commit(trans)) - ret = dsa_slave_stp_update(dev, attr->u.stp_state); + if (switchdev_trans_ph_prepare(trans)) + 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; |