| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
- From c2e963057ca5635d6e5387623c3ad0c0b3123754 Mon Sep 17 00:00:00 2001
- From: Daniel Hellstrom <[email protected]>
- Date: Wed, 1 Dec 2010 10:28:37 +0100
- Subject: [PATCH] GRETH: avoid writing bad speed/duplex when setting transfer mode
- Signed-off-by: Daniel Hellstrom <[email protected]>
- ---
- drivers/net/greth.c | 19 ++++++++-----------
- 1 files changed, 8 insertions(+), 11 deletions(-)
- --- a/drivers/net/greth.c
- +++ b/drivers/net/greth.c
- @@ -1236,29 +1236,26 @@ static void greth_link_change(struct net
- 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;
|