diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2011-02-15 20:32:04 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2011-02-15 20:36:11 +0000 |
| commit | 69a19ee60d5d5adc0addbdffd254f83b60660a07 (patch) | |
| tree | 1ddb2f75bb69dde71bf9d13dc04d2dfbd71e12d7 /net | |
| parent | 94b274bf5fba6c75b922c8a23ad4b5639a168780 (diff) | |
| download | linux-69a19ee60d5d5adc0addbdffd254f83b60660a07.tar.gz linux-69a19ee60d5d5adc0addbdffd254f83b60660a07.tar.bz2 linux-69a19ee60d5d5adc0addbdffd254f83b60660a07.zip | |
net: RPS: Make hardware-accelerated RFS conditional on NETIF_F_NTUPLE
For testing and debugging purposes it is useful to be able to disable
hardware acceleration of RFS without disabling RFS altogether. Since
this is a similar feature to 'n-tuple' flow steering through the
ethtool API, test the same feature flag that controls that.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'net')
| -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 30c71f9b0419..54aaca69a029 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2607,7 +2607,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)) |