diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-10 01:28:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-10 01:28:25 +0200 |
| commit | ebedb22d2bacdcf577348eae77ab8f27c9db8ee8 (patch) | |
| tree | 16abc0c02b45126e6064d6d9d71dc0cf9a870c72 /net | |
| parent | gianfar: Revive the driver for eTSEC devices (disable timestamping) (diff) | |
| parent | net: Print num_rx_queues imbalance warning only when there are allocated queues (diff) | |
| download | linux-ebedb22d2bacdcf577348eae77ab8f27c9db8ee8.tar.xz linux-ebedb22d2bacdcf577348eae77ab8f27c9db8ee8.zip | |
Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6
Diffstat (limited to 'net')
| -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, if (skb_rx_queue_recorded(skb)) { u16 index = skb_get_rx_queue(skb); if (unlikely(index >= dev->num_rx_queues)) { - if (net_ratelimit()) { - pr_warning("%s received packet on queue " - "%u, but number of RX queues is %u\n", - dev->name, index, dev->num_rx_queues); - } + WARN_ONCE(dev->num_rx_queues > 1, "%s received packet " + "on queue %u, but number of RX queues is %u\n", + dev->name, index, dev->num_rx_queues); goto done; } rxqueue = dev->_rx + index; |