Re: ixgb boolean typo ?

[Andrew Morton]

Dave Jones <davej@xxxxxxxxxx> wrote:
>
> Is this perhaps what was meant to be here ?
> 
>  		Dave
> 
>  --- 1/drivers/net/ixgb/ixgb_main.c~	2004-08-03 01:18:00.000000000 +0100
>  +++ 2/drivers/net/ixgb/ixgb_main.c	2004-08-03 01:53:46.653695768 +0100
>  @@ -1615,7 +1615,7 @@
>   	}
>   #else
>   	for (i = 0; i < IXGB_MAX_INTR; i++)
>  -		if (!ixgb_clean_rx_irq(adapter) & !ixgb_clean_tx_irq(adapter))
>  +		if (!ixgb_clean_rx_irq(adapter) && !ixgb_clean_tx_irq(adapter))
>   			break;
>   	/* if RAIDC:EN == 1 and ICR:RXDMT0 == 1, we need to
>   	 * set IMS:RXDMT0 to 1 to restart the RBD timer (POLL)

Both versions will do the same thing, inefficiently: keep going until both
functions return false.  And keep pointlessly calling a functions which is
returning FALSE all the time.

I think this would be better:

--- 25/drivers/net/ixgb/ixgb_main.c~igxb-speedup	2004-08-02 23:01:04.810311392 -0700
+++ 25-akpm/drivers/net/ixgb/ixgb_main.c	2004-08-02 23:02:18.475112640 -0700
@@ -1615,8 +1615,12 @@ static irqreturn_t ixgb_intr(int irq, vo
 	}
 #else
 	for (i = 0; i < IXGB_MAX_INTR; i++)
-		if (!ixgb_clean_rx_irq(adapter) & !ixgb_clean_tx_irq(adapter))
+		if (ixgb_clean_rx_irq(adapter) == FALSE)
 			break;
+	for (i = 0; i < IXGB_MAX_INTR; i++)
+		if (ixgb_clean_tx_irq(adapter) == FALSE)
+			break;
+
 	/* if RAIDC:EN == 1 and ICR:RXDMT0 == 1, we need to
 	 * set IMS:RXDMT0 to 1 to restart the RBD timer (POLL)
 	 */
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/