Leann,

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

rtg

--
Tim Gardner tim.gardner@canonical.com
The following changes since commit b46d39c8935ebca8ca2374484a3a083f0b80ee58:
Leann Ogasawara (1):
UBUNTU: Ubuntu-2.6.35-2.2

are available in the git repository at:

git://kernel.ubuntu.com/rtg/ubuntu-maverick.git lp591416-num-rx-queues

Tim Gardner (1):
UBUNTU: [Upstream] net: Print num_rx_queues imbalance warning only when there are allocated queues

net/core/dev.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
From b22c3bc8504b7db67b4dc5e30329a19c27a3d4e3 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 8 Jun 2010 17:51:27 -0600
Subject: [PATCH] UBUNTU: [Upstream] net: Print num_rx_queues imbalance warning only when there are allocated queues

BugLink: http://bugs.launchpad.net/bugs/591416

There are a number of network drivers (bridge, bonding, etc) that are not yet
receive multi-queue enabled and use alloc_netdev(), so don't print a
num_rx_queues imbalance warning in that case.

Also, only print the warning once for those drivers that _are_ multi-queue
enabled.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
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 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
",
- 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
",
+ dev->name, index, dev->num_rx_queues);
goto done;
}
rxqueue = dev->_rx + index;
--
1.7.0.4

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team