From de5d7816250ca7fa3ec2062ac68b36c468d1135b Mon Sep 17 00:00:00 2001
From: "Mark A. Greer" <mgreer@animalcreek.com>
Date: Fri, 20 Jul 2012 13:35:13 +0000
Subject: [PATCH] --- yaml --- r: 315774 b: refs/heads/master c:
 1d69c2b343c7e1dc9584b7aa446f40dbab4c4f80 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/rtnetlink.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d1fb0a86bd36..c92fd4b5b77d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd183f6a73fc0ff3e32c636dbb539e35d4c530c9
+refs/heads/master: 1d69c2b343c7e1dc9584b7aa446f40dbab4c4f80
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index 5bb1ebca2eb0..334b930e0de3 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/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 &&