diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-04 04:38:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-04 04:38:22 +0100 |
| commit | 9c119ba54c0fcae72881948af3d37b47a2f8e1f9 (patch) | |
| tree | 0be51b0bf02ece3bb32955e9d33a3998ecd57250 /drivers/net/ixgbe/ixgbe_main.c | |
| parent | sfc: Do not include unneeded headers (diff) | |
| parent | ixgbe: Fix return of invalid txq (diff) | |
| download | linux-9c119ba54c0fcae72881948af3d37b47a2f8e1f9.tar.xz linux-9c119ba54c0fcae72881948af3d37b47a2f8e1f9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 636985224afc..f098816d4199 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -5384,7 +5384,7 @@ dma_error: ixgbe_unmap_and_free_tx_resource(adapter, tx_buffer_info); } - return count; + return 0; } static void ixgbe_tx_queue(struct ixgbe_adapter *adapter, @@ -5534,8 +5534,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) && |