diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-22 13:21:36 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-22 13:21:36 -0500 |
| commit | 2a3bcfdde613884ba7c5bf0e116cfd1991d4ba20 (patch) | |
| tree | e853693868d15168382978c7b98e7d10c85d47b3 /net/core/dev.c | |
| parent | eaefd1105bc431ef329599e307a07f2a36ae7872 (diff) | |
| parent | 64d8ad6d745bbb596bfce3c5d0157267feba7e26 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 9d8bfd9d444b..578415c1ef75 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, | |||
| 2610 | int rc; | 2610 | int rc; |
| 2611 | 2611 | ||
| 2612 | /* Should we steer this flow to a different hardware queue? */ | 2612 | /* Should we steer this flow to a different hardware queue? */ |
| 2613 | if (!skb_rx_queue_recorded(skb) || !dev->rx_cpu_rmap) | 2613 | if (!skb_rx_queue_recorded(skb) || !dev->rx_cpu_rmap || |
| 2614 | !(dev->features & NETIF_F_NTUPLE)) | ||
| 2614 | goto out; | 2615 | goto out; |
| 2615 | rxq_index = cpu_rmap_lookup_index(dev->rx_cpu_rmap, next_cpu); | 2616 | rxq_index = cpu_rmap_lookup_index(dev->rx_cpu_rmap, next_cpu); |
| 2616 | if (rxq_index == skb_get_rx_queue(skb)) | 2617 | if (rxq_index == skb_get_rx_queue(skb)) |