Maverick pull request, LP591416 - 2.6.35-rc2 CONFIG_RPS=y fills log with noise

Message ID
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Tim Gardner June 9, 2010, 1:21 p.m.

This patch fixes the noise injected into the kernel log for servers that 
have multi-receive queue adapters. I'd like to see this applied soon 
(and uploaded) since I'm not sure what action upstream is taking on 
this. I can't seem to get any traction there. As soon as I see what 
they're gonna do I'll send a correction.



diff --git a/net/core/dev.c b/net/core/dev.c
index d03470f..0852608 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2253,7 +2253,7 @@  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()) {
+			if (dev->num_rx_queues > 1 && 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);