From: Daniel Hellstrom <daniel@gaisler.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, kristoffer@gaisler.com
Subject: [PATCH 5/7 v2] GRETH: avoid writing bad speed/duplex when setting transfer mode
Date: Fri, 14 Jan 2011 14:02:41 +0100 [thread overview]
Message-ID: <1295010163-2585-5-git-send-email-daniel@gaisler.com> (raw)
In-Reply-To: <1295010163-2585-1-git-send-email-daniel@gaisler.com>
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
---
drivers/net/greth.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 9386bce..e48d182 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -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;
--
1.5.4
next prev parent reply other threads:[~2011-01-14 13:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-14 13:02 [PATCH 1/7 v2] GRETH: added raw AMBA vendor/device number to match against Daniel Hellstrom
2011-01-14 13:02 ` [PATCH 2/7 v2] GRETH: fix opening/closing Daniel Hellstrom
2011-01-14 20:46 ` David Miller
2011-01-14 13:02 ` [PATCH 3/7 v2] GRETH: GBit transmit descriptor handling optimization Daniel Hellstrom
2011-01-14 20:46 ` David Miller
2011-01-14 13:02 ` [PATCH 4/7 v2] GRETH: fixed skb buffer memory leak on frame errors Daniel Hellstrom
2011-01-14 20:46 ` David Miller
2011-01-14 13:02 ` Daniel Hellstrom [this message]
2011-01-14 20:46 ` [PATCH 5/7 v2] GRETH: avoid writing bad speed/duplex when setting transfer mode David Miller
2011-01-14 13:02 ` [PATCH 6/7 v2] GRETH: handle frame error interrupts Daniel Hellstrom
2011-01-14 20:46 ` David Miller
2011-01-14 13:02 ` [PATCH 7/7 v2] GRETH: resolve SMP issues and other problems Daniel Hellstrom
2011-01-14 20:47 ` David Miller
2011-01-14 20:46 ` [PATCH 1/7 v2] GRETH: added raw AMBA vendor/device number to match against David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295010163-2585-5-git-send-email-daniel@gaisler.com \
--to=daniel@gaisler.com \
--cc=davem@davemloft.net \
--cc=kristoffer@gaisler.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).