Attachment 145902 Details for Bug 211270 – Revised patch to apply to later RHEL kernels

[patch] Revised patch to apply to later RHEL kernels

e1000-napi-poll-exit.patch (text/plain), 1.51 KB, created by Bryn M. Reeves on 2007-01-18 11:05:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2007-01-18 11:05:30 UTC

Size: 1.51 KB

patch

obsolete

>diff -Nrup linux-2.6.9-orgi/drivers/net/e1000/e1000_main.c linux-2.6.9/drivers/net/e1000/e1000_main.c
>--- linux-2.6.9-orgi/drivers/net/e1000/e1000_main.c	2007-01-11 20:32:50.000000000 -0500
>+++ linux-2.6.9/drivers/net/e1000/e1000_main.c	2007-01-11 21:02:19.000000000 -0500
>@@ -3467,7 +3467,7 @@ e1000_intr(int irq, void *data, struct p
> 
> 	for (i = 0; i < E1000_MAX_INTR; i++)
> 		if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
>-		   !e1000_clean_tx_irq(adapter, adapter->tx_ring)))
>+		   e1000_clean_tx_irq(adapter, adapter->tx_ring)))
> 			break;
> 
> 	if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)
>@@ -3515,7 +3515,7 @@ e1000_clean(struct net_device *poll_dev,
> 	poll_dev->quota -= work_done;
> 
> 	/* If no Tx and not enough Rx work done, exit the polling mode */
>-	if ((!tx_cleaned && (work_done == 0)) ||
>+	if ((tx_cleaned && (work_done < work_to_do)) ||
> 	   !netif_running(poll_dev)) {
> quit_polling:
> 		netif_rx_complete(poll_dev);
>@@ -3543,7 +3543,7 @@ e1000_clean_tx_irq(struct e1000_adapter 
> #ifdef CONFIG_E1000_NAPI
> 	unsigned int count = 0;
> #endif
>-	boolean_t cleaned = FALSE;
>+	boolean_t cleaned = TRUE;
> 
> 	i = tx_ring->next_to_clean;
> 	eop = tx_ring->buffer_info[i].next_to_watch;
>@@ -3567,7 +3567,10 @@ e1000_clean_tx_irq(struct e1000_adapter 
> #ifdef CONFIG_E1000_NAPI
> #define E1000_TX_WEIGHT 64
> 		/* weight of a sort for tx, to avoid endless transmit cleanup */
>-		if (count++ == E1000_TX_WEIGHT) break;
>+		if (count++ == E1000_TX_WEIGHT) {
>+			cleaned = FALSE;
>+			break;
>+		}
> #endif
> 	}
>

Actions: View | Diff

Attachments on bug 211270: 138772 | 139163 | 145902