* [PATCH net] sfc: remove incorrect EFX_BUG_ON_PARANOID check
@ 2014-10-21 13:50 Edward Cree
2014-10-22 16:51 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Edward Cree @ 2014-10-21 13:50 UTC (permalink / raw)
To: davem, netdev; +Cc: sshah, jcooper, linux-net-drivers
From: Jon Cooper <jcooper@solarflare.com>
write_count and insert_count can wrap around, making > check invalid.
Fixes: 70b33fb0ddec827cbbd14cdc664fc27b2ef4a6b6 ("sfc: add support for
skb->xmit_more").
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
Compile tested only.
drivers/net/ethernet/sfc/tx.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index ee84a90..aaf2987 100644
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -343,8 +343,6 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
unsigned short dma_flags;
int i = 0;
- EFX_BUG_ON_PARANOID(tx_queue->write_count > tx_queue->insert_count);
-
if (skb_shinfo(skb)->gso_size)
return efx_enqueue_skb_tso(tx_queue, skb);
@@ -1258,8 +1256,6 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,
/* Find the packet protocol and sanity-check it */
state.protocol = efx_tso_check_protocol(skb);
- EFX_BUG_ON_PARANOID(tx_queue->write_count > tx_queue->insert_count);
-
rc = tso_start(&state, efx, skb);
if (rc)
goto mem_err;
--
1.7.11.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] sfc: remove incorrect EFX_BUG_ON_PARANOID check
2014-10-21 13:50 [PATCH net] sfc: remove incorrect EFX_BUG_ON_PARANOID check Edward Cree
@ 2014-10-22 16:51 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-10-22 16:51 UTC (permalink / raw)
To: ecree; +Cc: netdev, sshah, jcooper, linux-net-drivers
From: Edward Cree <ecree@solarflare.com>
Date: Tue, 21 Oct 2014 14:50:29 +0100
> From: Jon Cooper <jcooper@solarflare.com>
>
> write_count and insert_count can wrap around, making > check invalid.
>
> Fixes: 70b33fb0ddec827cbbd14cdc664fc27b2ef4a6b6 ("sfc: add support for
> skb->xmit_more").
>
> Signed-off-by: Edward Cree <ecree@solarflare.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-22 16:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-21 13:50 [PATCH net] sfc: remove incorrect EFX_BUG_ON_PARANOID check Edward Cree
2014-10-22 16:51 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).