Patchwork Maverick pull request, LP591416 - 2.6.35-rc2 CONFIG_RPS=y fills log with noise (V2)

login
register
mail settings
Submitter Tim Gardner
Date June 9, 2010, 3:47 p.m.
Message ID <4C0FB7AE.9010306@canonical.com>
Download mbox | patch
Permalink /patch/55107/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Tim Gardner - June 9, 2010, 3:47 p.m.
Leann,

I've respun this patch which looks like it'll get accepted upstream.

rtg
Leann Ogasawara - June 10, 2010, 3:18 a.m.
Applied to Maverick linux master.

Thanks,
Leann

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index d03470f..14a8568 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;