aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.c
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2011-02-13 13:27:38 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-13 23:43:22 -0500
commit3903c023570446303a10f152cfc120dcbf9a4ccf (patch)
treec0ba9e3c9b29f1bb14f113c0ddee305e8d89202e /drivers/net/jme.c
parent51754572371491b63f70aae41dab70dfcaf771b2 (diff)
jme: Fix hardware action of full-duplex
Clear Transmit Timer/Retry setting while full-duplex. Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.c')
-rw-r--r--drivers/net/jme.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 490bc0feff3..6996d04e1de 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -439,16 +439,14 @@ jme_check_link(struct net_device *netdev, int testonly)
439 439
440 if (phylink & PHY_LINK_DUPLEX) { 440 if (phylink & PHY_LINK_DUPLEX) {
441 jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT); 441 jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT);
442 jwrite32(jme, JME_TXTRHD, TXTRHD_FULLDUPLEX);
442 ghc |= GHC_DPX; 443 ghc |= GHC_DPX;
443 } else { 444 } else {
444 jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT | 445 jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT |
445 TXMCS_BACKOFF | 446 TXMCS_BACKOFF |
446 TXMCS_CARRIERSENSE | 447 TXMCS_CARRIERSENSE |
447 TXMCS_COLLISION); 448 TXMCS_COLLISION);
448 jwrite32(jme, JME_TXTRHD, TXTRHD_TXPEN | 449 jwrite32(jme, JME_TXTRHD, TXTRHD_HALFDUPLEX);
449 ((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) |
450 TXTRHD_TXREN |
451 ((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL));
452 } 450 }
453 451
454 gpreg1 = GPREG1_DEFAULT; 452 gpreg1 = GPREG1_DEFAULT;