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 &&