ixgbe: Fix ixgbe_tx_map error path
Subsystems (2)
PATCH 1/2 ixgbe: Fix ixgbe_tx_map error path
From: Anton Blanchard <[email protected]>
Commit e5a43549f7a58509a91b299a51337d386697b92c (ixgbe: remove skb_dma_map/unmap calls from driver) looks to have introduced a bug in ixgbe_tx_map. If we get an error from a PCI DMA call, we loop backwards through count until it becomes -1 and return that.
The caller of ixgbe_tx_map expects 0 on error, so return that instead.
---
drivers/net/ixgbe/ixgbe_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +1 -1
@@ -5179,7 +5179,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,
PATCH 2/2 ixgbe: Fix return of invalid txq
From: Krishna Kumar <[email protected]>
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/[email protected]/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).
---
drivers/net/ixgbe/ixgbe_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +4 -1
@@ -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) &&
Re: [net-2.6 PATCH 2/2] ixgbe: Fix return of invalid txq
From: Jeff Kirsher <[email protected]>
Date: Wed, 03 Feb 2010 15:13:10 -0800
Quoted 8 lines
From: Krishna Kumar <[email protected]>
a developer had complained of getting lots of warnings:
"eth16 selects TX queue 98, but real number of TX queues is 64"
Quoted 8 lines
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 <[email protected]>Signed-off-by Jesse Brandeburg <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Wed, 03 Feb 2010 15:12:51 -0800
Quoted 11 lines
From: Anton Blanchard <[email protected]>
Commit
e5a43549f7a58509a91b299a51337d386697b92c(ixgbe: remove skb_dma_map/unmap calls from driver) looks to have introduced a bug inixgbe_tx_map. If we get an error from a PCI DMA call, we loop backwards through count until it becomes -1 and return that.The caller of
ixgbe_tx_mapexpects 0 on error, so return that instead.Signed-off-by Anton Blanchard <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.