Merge tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / net / bridge / br_stp_if.c

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 984d462630072a8a013a3ba041304564e1bd83f6..341caa0ca63a6f061b548909f66fa5fcea749215 100644 (file)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -55,7 +55,7 @@ void br_init_port(struct net_bridge_port *p)
                netdev_err(p->dev, "failed to set HW ageing time\n");
 }
 
-/* called under bridge lock */
+/* NO locks held */
 void br_stp_enable_bridge(struct net_bridge *br)
 {
        struct net_bridge_port *p;