aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2016-07-21 12:42:10 -0400
committerDavid S. Miller <davem@davemloft.net>2016-07-25 13:30:03 -0400
commitdba479f3d60a9d1f90458a4c6eb0754ecd22348c (patch)
tree1e763566b8507af0039d79fe893c7506c95bb9b8
parenteb97ad99f9edb827e34e32b117284265ef2bfc33 (diff)
net: bridge: fix br_stp_enable_bridge comment
br_stp_enable_bridge() does take the br->lock spinlock. Fix its wrongly pasted comment and use the same as br_stp_disable_bridge(). Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bridge/br_stp_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 984d46263007..341caa0ca63a 100644
--- 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)
55 netdev_err(p->dev, "failed to set HW ageing time\n"); 55 netdev_err(p->dev, "failed to set HW ageing time\n");
56} 56}
57 57
58/* called under bridge lock */ 58/* NO locks held */
59void br_stp_enable_bridge(struct net_bridge *br) 59void br_stp_enable_bridge(struct net_bridge *br)
60{ 60{
61 struct net_bridge_port *p; 61 struct net_bridge_port *p;