Patched in Tegra support.

1 files changed, 7 insertions, 10 deletions

diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index 5a15fabd6a7..678f1ffaf84 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -6,7 +6,7 @@
 
 typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *, void *);
 typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
-typedef u16 (*rtnl_calcit_func)(struct sk_buff *, struct nlmsghdr *);
+typedef u16 (*rtnl_calcit_func)(struct sk_buff *);
 
 extern int      __rtnl_register(int protocol, int msgtype,
                                 rtnl_doit_func, rtnl_dumpit_func,
@@ -41,13 +41,9 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
  *      @get_size: Function to calculate required room for dumping device
  *                 specific netlink attributes
  *      @fill_info: Function to dump device specific netlink attributes
- *      @get_xstats_size: Function to calculate required room for dumping device
+ *      @get_xstats_size: Function to calculate required room for dumping devic
  *                        specific statistics
  *      @fill_xstats: Function to dump device specific statistics
- *      @get_num_tx_queues: Function to determine number of transmit queues
- *                          to create when creating a new device.
- *      @get_num_rx_queues: Function to determine number of receive queues
- *                          to create when creating a new device.
  */
 struct rtnl_link_ops {
         struct list_head        list;
@@ -79,8 +75,9 @@ struct rtnl_link_ops {
         size_t                  (*get_xstats_size)(const struct net_device *dev);
         int                     (*fill_xstats)(struct sk_buff *skb,
                                                const struct net_device *dev);
-        unsigned int            (*get_num_tx_queues)(void);
-        unsigned int            (*get_num_rx_queues)(void);
+        int                     (*get_tx_queues)(struct net *net, struct nlattr *tb[],
+                                                 unsigned int *tx_queues,
+                                                 unsigned int *real_tx_queues);
 };
 
 extern int      __rtnl_link_register(struct rtnl_link_ops *ops);
@@ -97,7 +94,7 @@ extern void	rtnl_link_unregister(struct rtnl_link_ops *ops);
  *      @fill_link_af: Function to fill IFLA_AF_SPEC with address family
  *                     specific netlink attributes.
  *      @get_link_af_size: Function to calculate size of address family specific
- *                         netlink attributes.
+ *                         netlink attributes exlusive the container attribute.
  *      @validate_link_af: Validate a IFLA_AF_SPEC attribute, must check attr
  *                         for invalid configuration settings.
  *      @set_link_af: Function to parse a IFLA_AF_SPEC attribute and modify
@@ -125,7 +122,7 @@ extern void	rtnl_af_unregister(struct rtnl_af_ops *ops);
 
 
 extern struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);
-extern struct net_device *rtnl_create_link(struct net *net,
+extern struct net_device *rtnl_create_link(struct net *src_net, struct net *net,
         char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]);
 extern int rtnl_configure_link(struct net_device *dev,
                                const struct ifinfomsg *ifm);