aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c7
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:
5384 ixgbe_unmap_and_free_tx_resource(adapter, tx_buffer_info); 5384 ixgbe_unmap_and_free_tx_resource(adapter, tx_buffer_info);
5385 } 5385 }
5386 5386
5387 return count; 5387 return 0;
5388} 5388}
5389 5389
5390static void ixgbe_tx_queue(struct ixgbe_adapter *adapter, 5390static 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)
5534 struct ixgbe_adapter *adapter = netdev_priv(dev); 5534 struct ixgbe_adapter *adapter = netdev_priv(dev);
5535 int txq = smp_processor_id(); 5535 int txq = smp_processor_id();
5536 5536
5537 if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) 5537 if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
5538 while (unlikely(txq >= dev->real_num_tx_queues))
5539 txq -= dev->real_num_tx_queues;
5538 return txq; 5540 return txq;
5541 }
5539 5542
5540#ifdef IXGBE_FCOE 5543#ifdef IXGBE_FCOE
5541 if ((adapter->flags & IXGBE_FLAG_FCOE_ENABLED) && 5544 if ((adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&