diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-11-15 01:38:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-15 14:13:18 -0500 |
commit | ec1e5610c00c7f5bc530d2aadd47faa473b90a30 (patch) | |
tree | c3bc845f485911083e47e218e7f01eba4de1bbfd /net/bridge/br_netlink.c | |
parent | b5ed54e94d324f17c97852296d61a143f01b227a (diff) |
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_netlink.c')
-rw-r--r-- | net/bridge/br_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index e3de0a428f5..f8bf4c7f842 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c | |||
@@ -119,7 +119,7 @@ static int br_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) | |||
119 | 119 | ||
120 | idx = 0; | 120 | idx = 0; |
121 | for_each_netdev(net, dev) { | 121 | for_each_netdev(net, dev) { |
122 | struct net_bridge_port *port = br_port_get(dev); | 122 | struct net_bridge_port *port = br_port_get_rtnl(dev); |
123 | 123 | ||
124 | /* not a bridge port */ | 124 | /* not a bridge port */ |
125 | if (!port || idx < cb->args[0]) | 125 | if (!port || idx < cb->args[0]) |
@@ -171,7 +171,7 @@ static int br_rtm_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
171 | if (!dev) | 171 | if (!dev) |
172 | return -ENODEV; | 172 | return -ENODEV; |
173 | 173 | ||
174 | p = br_port_get(dev); | 174 | p = br_port_get_rtnl(dev); |
175 | if (!p) | 175 | if (!p) |
176 | return -EINVAL; | 176 | return -EINVAL; |
177 | 177 | ||