diff options
| author | Nick Bowler <nbowler@draconx.ca> | 2010-03-10 06:10:46 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 17:51:36 +0200 |
| commit | 05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590 (patch) | |
| tree | 91342c8836eb0453df57d92bb0cb02304f2180b0 /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| download | linux-05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590.tar.xz linux-05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/et131x/et1310_mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |