Skip to content

Commit

Permalink
GRETH: avoid writing bad speed/duplex when setting transfer mode
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Daniel Hellstrom authored and David S. Miller committed Jan 14, 2011
1 parent b669e7f commit 2436af8
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions drivers/net/greth.c
Original file line number Diff line number Diff line change
Expand Up @@ -1232,29 +1232,26 @@ static void greth_link_change(struct net_device *dev)
struct greth_private *greth = netdev_priv(dev);
struct phy_device *phydev = greth->phy;
unsigned long flags;

int status_change = 0;
u32 ctrl;

spin_lock_irqsave(&greth->devlock, flags);

if (phydev->link) {

if ((greth->speed != phydev->speed) || (greth->duplex != phydev->duplex)) {

GRETH_REGANDIN(greth->regs->control,
~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB));
ctrl = GRETH_REGLOAD(greth->regs->control) &
~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB);

if (phydev->duplex)
GRETH_REGORIN(greth->regs->control, GRETH_CTRL_FD);

if (phydev->speed == SPEED_100) {

GRETH_REGORIN(greth->regs->control, GRETH_CTRL_SP);
}
ctrl |= GRETH_CTRL_FD;

if (phydev->speed == SPEED_100)
ctrl |= GRETH_CTRL_SP;
else if (phydev->speed == SPEED_1000)
GRETH_REGORIN(greth->regs->control, GRETH_CTRL_GB);
ctrl |= GRETH_CTRL_GB;

GRETH_REGSAVE(greth->regs->control, ctrl);
greth->speed = phydev->speed;
greth->duplex = phydev->duplex;
status_change = 1;
Expand Down

0 comments on commit 2436af8

Please sign in to comment.