diff options
| author |   Anton Blanchard <anton@samba.org> | 2010-02-03 13:12:51 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-02-03 19:17:16 -0800 |
| commit | e44d38e1b72a2aa7f5e7024c5da83a879355a1cc (patch) | |
| tree | 9547a2760bbf453584da4578c14de04595f8106f /drivers/net/ixgbe | |
| parent | netxen: protect resource cleanup by rtnl lock (diff) | |
| download | linux-dev-e44d38e1b72a2aa7f5e7024c5da83a879355a1cc.tar.xz linux-dev-e44d38e1b72a2aa7f5e7024c5da83a879355a1cc.zip | |
ixgbe: Fix ixgbe_tx_map error path
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.
Signed-off-by: Anton Blanchard <anton@samba.org>
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index b5f64ad67975..37e2af0a6145 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -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, |