Re: Fix silly thinko in sungem network driver.

[Benjamin Herrenschmidt <benh@kernel.crashing.org>]

On Sat, 2004-02-21 at 11:04, Benjamin Herrenschmidt wrote:
> On Sat, 2004-02-21 at 09:29, Linux Kernel Mailing List wrote:
> > ChangeSet 1.1584, 2004/02/20 14:29:11-08:00, torvalds@ppc970.osdl.org
> > 
> > 	Fix silly thinko in sungem network driver.
> > 	
> 
> Argh. Actually, the patch is wrong as we are losing the 2 other
> magic bits (the RonPaul bit, dunno what it is, that's how it's
> called by Apple, end the other bugfix bit, some more apple magic).
> 
> Fixed patch on its way ... (as soon as I finish pulling, don't
> cancel that cset, I'll apply a patch on top of it)

Here it is:

--- linux-2.5/drivers/net/sungem.c	2004-02-21 11:10:33.390479384 +1100
+++ linuxppc-2.5-benh/drivers/net/sungem.c	2004-02-21 11:11:03.448909808 +1100
@@ -1837,7 +1837,8 @@
 	 * thresholds (and Apple bug fixes don't exist)
 	 */
 	if (!(readl(gp->regs + GREG_CFG) & GREG_CFG_IBURST)) {
-		cfg = ((2 << 1) & GREG_CFG_TXDMALIM);
+		cfg &= ~(GREG_CFG_TXDMALIM | GREG_CFG_TXDMALIM);
+		cfg |= ((2 << 1) & GREG_CFG_TXDMALIM);
 		cfg |= ((8 << 6) & GREG_CFG_RXDMALIM);
 		writel(cfg, gp->regs + GREG_CFG);
 	}