diff options
| author | Krishna Kumar <krkumar2@in.ibm.com> | 2010-02-03 13:13:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-03 19:17:17 -0800 |
| commit | fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f (patch) | |
| tree | 9f4b952c8cbfc2ad169a023c5321b3ff8bb2595d /drivers/net/ixgbe | |
| parent | e44d38e1b72a2aa7f5e7024c5da83a879355a1cc (diff) | |
| download | kernel_samsung_crespo-fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f.zip kernel_samsung_crespo-fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f.tar.gz kernel_samsung_crespo-fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f.tar.bz2 | |
ixgbe: Fix return of invalid txq
a developer had complained of getting lots of warnings:
"eth16 selects TX queue 98, but real number of TX queues is 64"
http://www.mail-archive.com/e1000-devel@lists.sourceforge.net/msg02200.html
As there was no follow up on that bug, I am submitting this
patch assuming that the other return points will not return
invalid txq's, and also that this fixes the bug (not tested).
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 37e2af0..7b7c848 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -5329,8 +5329,11 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb) struct ixgbe_adapter *adapter = netdev_priv(dev); int txq = smp_processor_id(); - if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) + if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) { + while (unlikely(txq >= dev->real_num_tx_queues)) + txq -= dev->real_num_tx_queues; return txq; + } #ifdef IXGBE_FCOE if ((adapter->flags & IXGBE_FLAG_FCOE_ENABLED) && |