Commit 1d69c2b3 authored Jul 20, 2012 by Mark A. Greer Committed by David S. Miller Jul 22, 2012

rtnl: Add #ifdef CONFIG_RPS around num_rx_queues reference



Commit 76ff5cc9
(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>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent fd183f6a

net/core/rtnetlink.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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 &&

Admin message