diff options
| author | Guo-Fu Tseng <cooldavid@cooldavid.org> | 2011-02-13 19:27:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-14 05:43:22 +0100 |
| commit | 3903c023570446303a10f152cfc120dcbf9a4ccf (patch) | |
| tree | c0ba9e3c9b29f1bb14f113c0ddee305e8d89202e /drivers/net/jme.c | |
| parent | jme: Rename phyfifo function for easier understand (diff) | |
| download | linux-3903c023570446303a10f152cfc120dcbf9a4ccf.tar.xz linux-3903c023570446303a10f152cfc120dcbf9a4ccf.zip | |
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.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 490bc0feff3d..6996d04e1de4 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -439,16 +439,14 @@ jme_check_link(struct net_device *netdev, int testonly) if (phylink & PHY_LINK_DUPLEX) { jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT); + jwrite32(jme, JME_TXTRHD, TXTRHD_FULLDUPLEX); ghc |= GHC_DPX; } else { jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT | TXMCS_BACKOFF | TXMCS_CARRIERSENSE | TXMCS_COLLISION); - jwrite32(jme, JME_TXTRHD, TXTRHD_TXPEN | - ((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) | - TXTRHD_TXREN | - ((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL)); + jwrite32(jme, JME_TXTRHD, TXTRHD_HALFDUPLEX); } gpreg1 = GPREG1_DEFAULT; |