diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-26 01:47:38 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-11-26 01:47:38 +0300 |
| commit | d3de94ba4e58e8043d500f7335797d6a2ac93248 (patch) | |
| tree | 8382a170965eec00ebfe62e7b42dfdea9ca44f54 /net/bridge/br_stp.c | |
| parent | fabc2c9c1ff5376489e83e142f1ab236609435b1 (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
| download | linux-d3de94ba4e58e8043d500f7335797d6a2ac93248.tar.xz | |
Merge tag 'v4.4-rc2' into fixes
Linux 4.4-rc2 is backmerged from the keystone fixes.
Diffstat (limited to 'net/bridge/br_stp.c')
| -rw-r--r-- | net/bridge/br_stp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index f7e8dee64fc8..5f3f64553179 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -48,7 +48,7 @@ void br_set_state(struct net_bridge_port *p, unsigned int state) p->state = state; err = switchdev_port_attr_set(p->dev, &attr); - if (err) + if (err && err != -EOPNOTSUPP) br_warn(p->br, "error setting offload STP state on port %u(%s)\n", (unsigned int) p->port_no, p->dev->name); } |