Merge tag 'for-3.14' of git://openrisc.net/~jonas/linux

[~andy/linux] / include / net / rtnetlink.h

diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index bb13a182fba6ed076851f58590ab662e429bf01a..661e45d3805173b119c3fdbfe477922528172562 100644 (file)
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -79,6 +79,20 @@ struct rtnl_link_ops {
                                               const struct net_device *dev);
        unsigned int            (*get_num_tx_queues)(void);
        unsigned int            (*get_num_rx_queues)(void);
+
+       int                     slave_maxtype;
+       const struct nla_policy *slave_policy;
+       int                     (*slave_validate)(struct nlattr *tb[],
+                                                 struct nlattr *data[]);
+       int                     (*slave_changelink)(struct net_device *dev,
+                                                   struct net_device *slave_dev,
+                                                   struct nlattr *tb[],
+                                                   struct nlattr *data[]);
+       size_t                  (*get_slave_size)(const struct net_device *dev,
+                                                 const struct net_device *slave_dev);
+       int                     (*fill_slave_info)(struct sk_buff *skb,
+                                                  const struct net_device *dev,
+                                                  const struct net_device *slave_dev);
 };
 
 int __rtnl_link_register(struct rtnl_link_ops *ops);
@@ -115,10 +129,9 @@ struct rtnl_af_ops {
                                               const struct nlattr *attr);
 };
 
-int __rtnl_af_register(struct rtnl_af_ops *ops);
 void __rtnl_af_unregister(struct rtnl_af_ops *ops);
 
-int rtnl_af_register(struct rtnl_af_ops *ops);
+void rtnl_af_register(struct rtnl_af_ops *ops);
 void rtnl_af_unregister(struct rtnl_af_ops *ops);
 
 struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);