Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / net / bridge / br_stp.c

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 2b047bc..fb3ebe6 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -12,6 +12,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/rculist.h>
+#include <net/switchdev.h>
 
 #include "br_private.h"
 #include "br_private_stp.h"
@@ -38,7 +39,13 @@ void br_log_state(const struct net_bridge_port *p)
 
 void br_set_state(struct net_bridge_port *p, unsigned int state)
 {
+       int err;
+
        p->state = state;
+       err = netdev_switch_port_stp_update(p->dev, state);
+       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);
 }
 
 /* called under bridge lock */