projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b72c409
)
Staging: et131x: Properly disable FC in txmac.
author
Nick Bowler
<
[email protected]
>
Wed, 10 Mar 2010 05:10:46 +0000
(
00:10
-0500)
committer
Linus Torvalds
<
[email protected]
>
Mon, 29 Mar 2010 15:51:36 +0000
(08:51 -0700)
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 <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/staging/et131x/et1310_mac.c
patch
|
blob
|
history
diff --git
a/drivers/staging/et131x/et1310_mac.c
b/drivers/staging/et131x/et1310_mac.c
index a292b1edc41435886ceecc013db7754d67fe6f01..737a9f5401d1be0ade322d3e198bb6ef2b0f1a38 100644
(file)
--- 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 |= 0x0
5
; /* TX mac enable, FC disable */
+ ctl |= 0x0
9
; /* TX mac enable, FC disable */
writel(ctl, &etdev->regs->txmac.ctl);
/* Ready to start the RXDMA/TXDMA engine */