summaryrefslogtreecommitdiff
path: root/net/bridge/br_notify.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-11-15 09:38:14 +0300
committerDavid S. Miller <davem@davemloft.net>2010-11-15 22:13:18 +0300
commitec1e5610c00c7f5bc530d2aadd47faa473b90a30 (patch)
treec3bc845f485911083e47e218e7f01eba4de1bbfd /net/bridge/br_notify.c
parentb5ed54e94d324f17c97852296d61a143f01b227a (diff)
downloadlinux-ec1e5610c00c7f5bc530d2aadd47faa473b90a30.tar.xz
bridge: add RCU annotations to bridge port lookup
br_port_get() renamed to br_port_get_rtnl() to make clear RTNL is held. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_notify.c')
-rw-r--r--net/bridge/br_notify.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index ef2175c8b91d..7d337c9b6082 100644
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -37,10 +37,10 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
int err;
/* not a port of a bridge */
- if (!br_port_exists(dev))
+ p = br_port_get_rtnl(dev);
+ if (!p)
return NOTIFY_DONE;
- p = br_port_get(dev);
br = p->br;
switch (event) {