Commit 05ad62a5 authored Mar 10, 2010 by Nick Bowler Committed by Linus Torvalds Mar 29, 2010

Staging: et131x: Properly disable FC in txmac.



FC disable is bit 3 of the txmac ctl register, but commit 6720949d
("Staging: et131x: Kil the txmac type") accidentally changed the code to
set bit 2 instead.

Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b72c4094

drivers/staging/et131x/et1310_mac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
		}

		/* Enable TXMAC */
		ctl \|= 0x05; /* TX mac enable, FC disable */
		ctl \|= 0x09; /* TX mac enable, FC disable */
		writel(ctl, &etdev->regs->txmac.ctl);

		/* Ready to start the RXDMA/TXDMA engine */

Admin message