From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 10 Mar 2010 05:10:46 +0000 (-0500)
Subject: Staging: et131x: Properly disable FC in txmac.
X-Git-Tag: MMI-PSA29.97-13-9~24256
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: et131x: Properly disable FC in txmac.

FC disable is bit 3 of the txmac ctl register, but commit 6720949d5562
("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>
---

diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c
index a292b1edc414..737a9f5401d1 100644
--- a/drivers/staging/et131x/et1310_mac.c
+++ b/drivers/staging/et131x/et1310_mac.c
@@ -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 */