bridge: add RCU annotations to bridge port lookup

[net-next-2.6.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index e3de0a428f5d52c7a33393a74e7361a74aae370d..f8bf4c7f842c1714850ef21926035d44ee740bd4 100644 (file)
--- 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)
 
        idx = 0;
        for_each_netdev(net, dev) {
-               struct net_bridge_port *port = br_port_get(dev);
+               struct net_bridge_port *port = br_port_get_rtnl(dev);
 
                /* not a bridge port */
                if (!port || idx < cb->args[0])
@@ -171,7 +171,7 @@ static int br_rtm_setlink(struct sk_buff *skb,  struct nlmsghdr *nlh, void *arg)
        if (!dev)
                return -ENODEV;
 
-       p = br_port_get(dev);
+       p = br_port_get_rtnl(dev);
        if (!p)
                return -EINVAL;