diff options
author | 2017-10-19 20:07:36 +0100 | |
---|---|---|
committer | 2017-10-26 07:42:58 -0700 | |
commit | 104ba83363d1d42af62abb247f1426c09a80fced (patch) | |
tree | 2427b4f0ce295c14b91706891ca830bdb0aae6a1 /drivers/net | |
parent | e1000: avoid null pointer dereference on invalid stat type (diff) | |
download | linux-104ba83363d1d42af62abb247f1426c09a80fced.tar.gz linux-104ba83363d1d42af62abb247f1426c09a80fced.tar.bz2 linux-104ba83363d1d42af62abb247f1426c09a80fced.zip |
igb: Fix TX map failure path
When the driver cannot map a TX buffer, instead of rolling back
gracefully and retrying later, we currently get a panic:
[ 159.885994] igb 0000:00:00.0: TX DMA map failed
[ 159.886588] Unable to handle kernel paging request at virtual address ffff00000a08c7a8
...
[ 159.897031] PC is at igb_xmit_frame_ring+0x9c8/0xcb8
Fix the erroneous test that leads to this situation.
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index fd4a46b03cc8..ea69af267d63 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -5326,7 +5326,7 @@ dma_error: DMA_TO_DEVICE); dma_unmap_len_set(tx_buffer, len, 0); - if (i--) + if (i-- == 0) i += tx_ring->count; tx_buffer = &tx_ring->tx_buffer_info[i]; } |