bridge: add RCU annotations to bridge port lookup

[net-next-2.6.git] / net / bridge / br_private.h

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 46e0bec1d7c5ca764313966f4acab25d6fc623cf..84aac7734bfc7e2c219680dc48d8c3ba75ca6924 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -159,9 +159,10 @@ static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *d
        return br_port_exists(dev) ? port : NULL;
 }
 
-static inline struct net_bridge_port *br_port_get(struct net_device *dev)
+static inline struct net_bridge_port *br_port_get_rtnl(struct net_device *dev)
 {
-       return br_port_exists(dev) ? dev->rx_handler_data : NULL;
+       return br_port_exists(dev) ?
+               rtnl_dereference(dev->rx_handler_data) : NULL;
 }
 
 struct br_cpu_netstats {