[PATCH 0/1] myri10ge update for 2.6.23

[PATCH 0/1] myri10ge update for 2.6.23

[Brice Goglin]

Hi Jeff,

Almost nothing new regarding myri10ge in 2.6.23 for now, just a single
patch to remove some non-sensical code in the tx done routine.

Please apply, thanks,
Brice

[PATCH 1/1] myri10ge: Remove nonsensical limit in the tx done routine

[Brice Goglin]

Remove nonsensical limit in the tx done routine. Specifically,
the loop will always terminate after processing <= 1 rings worth
of frames, as the mcp index is not refetched, so the removed
conditional could never be true.

Signed-off-by: Brice Goglin <brice@myri.com>
---
 drivers/net/myri10ge/myri10ge.c |    6 ------
 1 file changed, 6 deletions(-)

Index: linux-2.6.22/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-2.6.22.orig/drivers/net/myri10ge/myri10ge.c	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22/drivers/net/myri10ge/myri10ge.c	2007-07-12 11:21:29.000000000 +0200
@@ -1059,7 +1059,6 @@
 	struct myri10ge_tx_buf *tx = &mgp->tx;
 	struct sk_buff *skb;
 	int idx, len;
-	int limit = 0;
 
 	while (tx->pkt_done != mcp_index) {
 		idx = tx->done & tx->mask;
@@ -1090,11 +1089,6 @@
 							      bus), len,
 					       PCI_DMA_TODEVICE);
 		}
-
-		/* limit potential for livelock by only handling
-		 * 2 full tx rings per call */
-		if (unlikely(++limit > 2 * tx->mask))
-			break;
 	}
 	/* start the queue if we've stopped it */
 	if (netif_queue_stopped(mgp->dev)

Re: [PATCH 1/1] myri10ge: Remove nonsensical limit in the tx done routine

[Jeff Garzik]

Brice Goglin wrote:
> Remove nonsensical limit in the tx done routine. Specifically,
> the loop will always terminate after processing <= 1 rings worth
> of frames, as the mcp index is not refetched, so the removed
> conditional could never be true.
> 
> Signed-off-by: Brice Goglin <brice@myri.com>
> ---
>  drivers/net/myri10ge/myri10ge.c |    6 ------
>  1 file changed, 6 deletions(-)

applied

[PATCH 0/1] myri10ge update for 2.6.23

[Brice Goglin]

Hi Jeff,

Aside from the LRO patch that DaveM queued for 2.6.24, here's a small
fix for myri10ge in 2.6.23:

1. Use the pause counter to avoid a needless device reset

Please apply, thanks,
Brice

[PATCH 0/1] myri10ge update for 2.6.23

[Brice Goglin]

Hi Jeff,

The following patch adds support for a new PCI device id. Please apply
for 2.6.23.

Thanks,
Brice