e1000: Fix tests of unsigned in e1000_tx_map()
PATCH 1/1 e1000: Fix tests of unsigned in e1000_tx_map()
The variables count and i are unsigned so the (<|>=) 0 tests do not work.
---
Found using coccinelle: http://coccinelle.lip6.fr/
I wasn't able to test this, so please review.
drivers/net/e1000/e1000_main.c +5 -5
@@ -2802,13 +2802,13 @@ static int e1000_tx_map(struct e1000_adapter *adapter, dma_error:dev_err (&pdev->dev,"TX DMA map failed\n" ); buffer_info->dma =0 ; - count--; - -while (count >=0 ) { +if (count) count--; - i--; -if (i <0 ) + +while (count--) { +if (i ==0 ) i += tx_ring->count; + i--; buffer_info = &tx_ring->buffer_info[i];e1000_unmap_and_free_tx_resource (adapter, buffer_info); }
drivers/net/e1000e/netdev.c +5 -5
@@ -3962,13 +3962,13 @@ static int e1000_tx_map(struct e1000_adapter *adapter, dma_error:dev_err (&pdev->dev,"TX DMA map failed\n" ); buffer_info->dma =0 ; - count--; - -while (count >=0 ) { +if (count) count--; - i--; -if (i <0 ) + +while (count--) { +if (i ==0 ) i += tx_ring->count; + i--; buffer_info = &tx_ring->buffer_info[i];e1000_put_txbuf (adapter, buffer_info);; }
Quoted 1 line · Roel Kluin
The variables count and i are unsigned so the (<|>=) 0 tests do not work.
I now see there are similar issues in igb and friends, I'll post a patch that includes these as well.
Roel
The variables count and i are unsigned so the (<|>=) 0 tests do not work.
---
Found using coccinelle: http://coccinelle.lip6.fr/
This should be all with this pattern.
As before I wasn't able to test this patch, so please review.
drivers/net/e1000/e1000_main.c | 10 +++++----- drivers/net/e1000e/netdev.c | 10 +++++----- drivers/net/igb/igb_main.c | 10 +++++----- drivers/net/igbvf/netdev.c | 10 +++++----- drivers/net/ixgb/ixgb_main.c | 10 +++++----- drivers/net/ixgbe/ixgbe_main.c | 10 +++++----- 6 files changed, 30 insertions(+), 30 deletions(-)
drivers/net/e1000/e1000_main.c +5 -5
@@ -2802,13 +2802,13 @@ static int e1000_tx_map(struct e1000_adapter *adapter, dma_error:dev_err (&pdev->dev,"TX DMA map failed\n" ); buffer_info->dma =0 ; - count--; - -while (count >=0 ) { +if (count) count--; - i--; -if (i <0 ) + +while (count--) { +if (i ==0 ) i += tx_ring->count; + i--; buffer_info = &tx_ring->buffer_info[i];e1000_unmap_and_free_tx_resource (adapter, buffer_info); }
drivers/net/e1000e/netdev.c +5 -5
@@ -3962,13 +3962,13 @@ static int e1000_tx_map(struct e1000_adapter *adapter, dma_error:dev_err (&pdev->dev,"TX DMA map failed\n" ); buffer_info->dma =0 ; - count--; - -while (count >=0 ) { +if (count) count--; - i--; -if (i <0 ) + +while (count--) { +if (i ==0 ) i += tx_ring->count; + i--; buffer_info = &tx_ring->buffer_info[i];e1000_put_txbuf (adapter, buffer_info);; }
drivers/net/igb/igb_main.c +5 -5
@@ -3627,14 +3627,14 @@ dma_error: buffer_info->length =0 ; buffer_info->next_to_watch =0 ; buffer_info->mapped_as_page = false; - count--; +if (count) + count--;/* clear timestamp and dma mappings for remaining portion of packet */ -while (count >=0 ) { - count--; - i--; -if (i <0 ) +while (count--) { +if (i ==0 ) i += tx_ring->count; + i--; buffer_info = &tx_ring->buffer_info[i];igb_unmap_and_free_tx_resource (tx_ring, buffer_info); }
drivers/net/igbvf/netdev.c +5 -5
@@ -2163,14 +2163,14 @@ dma_error: buffer_info->length =0 ; buffer_info->next_to_watch =0 ; buffer_info->mapped_as_page = false; - count--; +if (count) + count--;/* clear timestamp and dma mappings for remaining portion of packet */ -while (count >=0 ) { - count--; - i--; -if (i <0 ) +while (count--) { +if (i ==0 ) i += tx_ring->count; + i--; buffer_info = &tx_ring->buffer_info[i];igbvf_put_txbuf (adapter, buffer_info); }
drivers/net/ixgb/ixgb_main.c +5 -5
@@ -1363,13 +1363,13 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, dma_error:dev_err (&pdev->dev,"TX DMA map failed\n" ); buffer_info->dma =0 ; - count--; - -while (count >=0 ) { +if (count) count--; - i--; -if (i <0 ) + +while (count--) { +if (i ==0 ) i += tx_ring->count; + i--; buffer_info = &tx_ring->buffer_info[i];ixgb_unmap_and_free_tx_resource (adapter, buffer_info); }
drivers/net/ixgbe/ixgbe_main.c +5 -5
@@ -5143,14 +5143,14 @@ dma_error: tx_buffer_info->dma =0 ; tx_buffer_info->time_stamp =0 ; tx_buffer_info->next_to_watch =0 ; - count--; +if (count) + count--;/* clear timestamp and dma mappings for remaining portion of packet */ -while (count >=0 ) { - count--; - i--; -if (i <0 ) +while (count--) { +if (i ==0 ) i += tx_ring->count; + i--; tx_buffer_info = &tx_ring->tx_buffer_info[i];ixgbe_unmap_and_free_tx_resource (adapter, tx_buffer_info); }
Quoted 9 lines · Roel Kluin
The variables count and i are unsigned so the (<|>=) 0 tests do not work.
Signed-off-by Roel Kluin <[email protected]>---
Found using coccinelle: http://coccinelle.lip6.fr/This should be all with this pattern.
As before I wasn't able to test this patch, so please review.
Quoted 8 lines
drivers/net/e1000/e1000_main.c | 10 +++++-----
drivers/net/e1000e/netdev.c | 10 +++++----- drivers/net/igb/igb_main.c | 10 +++++----- drivers/net/igbvf/netdev.c | 10 +++++----- drivers/net/ixgb/ixgb_main.c | 10 +++++----- drivers/net/ixgbe/ixgbe_main.c | 10 +++++----- 6 files changed, 30 insertions(+), 30 deletions(-)
Thanks Roel, I will add this patch to my queue. Sorry for the delayed response, for some odd reason your email got filtered.
Signature · 2 lines
Cheers, Jeff