diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-09 19:28:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-09 19:28:25 -0400 |
commit | ebedb22d2bacdcf577348eae77ab8f27c9db8ee8 (patch) | |
tree | 16abc0c02b45126e6064d6d9d71dc0cf9a870c72 | |
parent | 619baba195d92ec39379e24c151f4a640898d140 (diff) | |
parent | 08c801f8d45387a1b46066aad1789a9bb9c4b645 (diff) |
Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6
-rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index d03470f5260a..14a85682af38 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2253,11 +2253,9 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb, | |||
2253 | if (skb_rx_queue_recorded(skb)) { | 2253 | if (skb_rx_queue_recorded(skb)) { |
2254 | u16 index = skb_get_rx_queue(skb); | 2254 | u16 index = skb_get_rx_queue(skb); |
2255 | if (unlikely(index >= dev->num_rx_queues)) { | 2255 | if (unlikely(index >= dev->num_rx_queues)) { |
2256 | if (net_ratelimit()) { | 2256 | WARN_ONCE(dev->num_rx_queues > 1, "%s received packet " |
2257 | pr_warning("%s received packet on queue " | 2257 | "on queue %u, but number of RX queues is %u\n", |
2258 | "%u, but number of RX queues is %u\n", | 2258 | dev->name, index, dev->num_rx_queues); |
2259 | dev->name, index, dev->num_rx_queues); | ||
2260 | } | ||
2261 | goto done; | 2259 | goto done; |
2262 | } | 2260 | } |
2263 | rxqueue = dev->_rx + index; | 2261 | rxqueue = dev->_rx + index; |