[PATCH] rtnl: Add #ifdef CONFIG_RPS around num_rx_queues reference

[PATCH] rtnl: Add #ifdef CONFIG_RPS around num_rx_queues reference

[Mark A. Greer]

From: "Mark A. Greer" <mgreer@animalcreek.com>

Commit 76ff5cc91935c51fcf1a6a99ffa28b97a6e7a884
(rtnl: allow to specify number of rx and tx queues
on device creation) added a reference to the net_device
structure's 'num_rx_queues' member in

	net/core/rtnetlink.c:rtnl_fill_ifinfo()

However, the definition for 'num_rx_queues' is surrounded
by an '#ifdef CONFIG_RPS' while the new reference to it is
not.  This causes a compile error when CONFIG_RPS is not
defined.

Fix the compile error by surrounding the new reference to
'num_rx_queues' by an '#ifdef CONFIG_RPS'.

CC: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
---

The problem can be easily reproduced by compiling with
davinci_all_defconfig (ARCH=arm).  I don't know this
area well enough to know whether that (and other)
defconfigs should have CONFIG_RPS enabled or not, or
whether there is some missing Kconfig logic to enable
it.

 net/core/rtnetlink.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 5bb1ebc..334b930 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -892,7 +892,9 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
 	    nla_put_u32(skb, IFLA_GROUP, dev->group) ||
 	    nla_put_u32(skb, IFLA_PROMISCUITY, dev->promiscuity) ||
 	    nla_put_u32(skb, IFLA_NUM_TX_QUEUES, dev->num_tx_queues) ||
+#ifdef CONFIG_RPS
 	    nla_put_u32(skb, IFLA_NUM_RX_QUEUES, dev->num_rx_queues) ||
+#endif
 	    (dev->ifindex != dev->iflink &&
 	     nla_put_u32(skb, IFLA_LINK, dev->iflink)) ||
 	    (dev->master &&
-- 
1.7.11.2

Re: [PATCH] rtnl: Add #ifdef CONFIG_RPS around num_rx_queues reference

[David Miller]

From: "Mark A. Greer" <mgreer@animalcreek.com>
Date: Fri, 20 Jul 2012 16:35:13 -0700

> From: "Mark A. Greer" <mgreer@animalcreek.com>
> 
> Commit 76ff5cc91935c51fcf1a6a99ffa28b97a6e7a884
> (rtnl: allow to specify number of rx and tx queues
> on device creation) added a reference to the net_device
> structure's 'num_rx_queues' member in
> 
> 	net/core/rtnetlink.c:rtnl_fill_ifinfo()
> 
> However, the definition for 'num_rx_queues' is surrounded
> by an '#ifdef CONFIG_RPS' while the new reference to it is
> not.  This causes a compile error when CONFIG_RPS is not
> defined.
> 
> Fix the compile error by surrounding the new reference to
> 'num_rx_queues' by an '#ifdef CONFIG_RPS'.
> 
> CC: Jiri Pirko <jiri@resnulli.us>
> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>

Applied, thanks Mark.