Merge tag 'msm-fix-noncrit-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / include / net / rtnetlink.h

diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index bbcfd09934324ba95f05f013d729d579a8e4410d..6b00c4fc4291f1704e439e4a5db217b6f0a3db2d 100644 (file)
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -44,8 +44,10 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
  *     @get_xstats_size: Function to calculate required room for dumping device
  *                       specific statistics
  *     @fill_xstats: Function to dump device specific statistics
- *     @get_tx_queues: Function to determine number of transmit queues to create when
- *                     creating a new device.
+ *     @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;
@@ -77,8 +79,8 @@ 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);
-       int                     (*get_tx_queues)(struct net *net,
-                                                struct nlattr *tb[]);
+       unsigned int            (*get_num_tx_queues)(void);
+       unsigned int            (*get_num_rx_queues)(void);
 };
 
 extern int     __rtnl_link_register(struct rtnl_link_ops *ops);