Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6

ebedb22d · David S. Miller · 619baba1 · 08c801f8 · ebedb22d
Commit ebedb22d authored Jun 09, 2010 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

net/core/dev.c net/core/dev.c +3 -5

No files found.
--- 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()) {
+			WARN_ONCE(dev->num_rx_queues > 1, "%s received packet "
-				pr_warning("%s received packet on queue "
+				"on queue %u, but number of RX queues is %u\n",
-					"%u, but number of RX queues is %u\n",
 				dev->name, index, dev->num_rx_queues);
-			}
 			goto done;
 		}
 		rxqueue = dev->_rx + index;