aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-22 10:21:36 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-22 10:21:36 -0800
commit2a3bcfdde613884ba7c5bf0e116cfd1991d4ba20 (patch)
treee853693868d15168382978c7b98e7d10c85d47b3 /net/core
parenteaefd1105bc431ef329599e307a07f2a36ae7872 (diff)
parent64d8ad6d745bbb596bfce3c5d0157267feba7e26 (diff)
downloadkernel_goldelico_gta04-2a3bcfdde613884ba7c5bf0e116cfd1991d4ba20.zip
kernel_goldelico_gta04-2a3bcfdde613884ba7c5bf0e116cfd1991d4ba20.tar.gz
kernel_goldelico_gta04-2a3bcfdde613884ba7c5bf0e116cfd1991d4ba20.tar.bz2
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 9d8bfd9..578415c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2610,7 +2610,8 @@ set_rps_cpu(struct net_device *dev, struct sk_buff *skb,
int rc;
/* Should we steer this flow to a different hardware queue? */
- if (!skb_rx_queue_recorded(skb) || !dev->rx_cpu_rmap)
+ if (!skb_rx_queue_recorded(skb) || !dev->rx_cpu_rmap ||
+ !(dev->features & NETIF_F_NTUPLE))
goto out;
rxq_index = cpu_rmap_lookup_index(dev->rx_cpu_rmap, next_cpu);
if (rxq_index == skb_get_rx_queue(skb))