Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e44d38e1 authored by Anton Blanchard's avatar Anton Blanchard Committed by David S. Miller
Browse files

ixgbe: Fix ixgbe_tx_map error path 



Commit e5a43549 (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: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e15eec28

drivers/net/ixgbe/ixgbe_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5179,7 +5179,7 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter, 
		ixgbe_unmap_and_free_tx_resource(adapter, tx_buffer_info);

		ixgbe_unmap_and_free_tx_resource(adapter, tx_buffer_info);

	}

	}





	return count;

	return 0;

}

}





static void ixgbe_tx_queue(struct ixgbe_adapter *adapter,

static void ixgbe_tx_queue(struct ixgbe_adapter *adapter,