diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-03-22 19:59:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-25 11:56:32 -0700 |
| commit | bcbe53682f65330bdd9ad7eed9575d2ff536353a (patch) | |
| tree | f68663eb654ab83687ec6dc1f5ebaf9dec648089 /drivers/net/via-velocity.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 (diff) | |
| download | linux-dev-bcbe53682f65330bdd9ad7eed9575d2ff536353a.tar.xz linux-dev-bcbe53682f65330bdd9ad7eed9575d2ff536353a.zip | |
via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control()
Clear, don't set, ANAR_ASMDIR in this case.
Noticed by Roel Kluin.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 3a486f3bad3d..bc278d4ee89d 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -812,7 +812,7 @@ static void set_mii_flow_control(struct velocity_info *vptr) case FLOW_CNTL_TX_RX: MII_REG_BITS_ON(ANAR_PAUSE, MII_REG_ANAR, vptr->mac_regs); - MII_REG_BITS_ON(ANAR_ASMDIR, MII_REG_ANAR, vptr->mac_regs); + MII_REG_BITS_OFF(ANAR_ASMDIR, MII_REG_ANAR, vptr->mac_regs); break; case FLOW_CNTL_DISABLE: |