net: set and query VEB/VEPA bridge mode via PF_BRIDGE

[~andy/linux] / net / bridge / br_private.h

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 9b278c4ebee10efb45ee07f480f749e609ca891e..6f40c14a2a65289cb9a26fb50466197b8e6b91ac 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -158,7 +158,9 @@ struct net_bridge_port
 
 static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)
 {
-       struct net_bridge_port *port = rcu_dereference(dev->rx_handler_data);
+       struct net_bridge_port *port =
+                       rcu_dereference_rtnl(dev->rx_handler_data);
+
        return br_port_exists(dev) ? port : NULL;
 }
 
@@ -553,6 +555,9 @@ extern struct rtnl_link_ops br_link_ops;
 extern int br_netlink_init(void);
 extern void br_netlink_fini(void);
 extern void br_ifinfo_notify(int event, struct net_bridge_port *port);
+extern int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg);
+extern int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
+                     struct net_device *dev);
 
 #ifdef CONFIG_SYSFS
 /* br_sysfs_if.c */