From: Roger Luethi <rl@hellgate.ch>
To: Jeff Garzik <jgarzik@pobox.com>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, netdev@hellgate.ch
Subject: [1/4][PATCH 2.6] via-rhine: Fix force media
Date: Sun, 23 May 2004 12:48:59 +0200 [thread overview]
Message-ID: <20040523104859.GA10091@k3.hellgate.ch> (raw)
In-Reply-To: <20040523104650.GA9979@k3.hellgate.ch>
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
Lucas Nussbaum and Dirk Koeppen each found independently that the code
for forcing media options in via-rhine is borked and suggested the fix
below. I've been sitting on this way too long because there is more
badness in the immediate vicinity which needs a bigger surgery.
The second hunk fixes a braino I managed to introduce myself.
[-- Attachment #2: via-rhine-2.6.6-1-fix.diff --]
[-- Type: text/plain, Size: 904 bytes --]
--- linux-2.6.6/drivers/net/via-rhine.c 2004-05-20 16:17:38.228468522 +0200
+++ linux-2.6.6-patch/drivers/net/via-rhine.c 2004-05-20 17:46:34.466916644 +0200
@@ -860,7 +860,7 @@
if (option & 0x220)
np->mii_if.full_duplex = 1;
np->default_port = option & 0x3ff;
- if (np->default_port & 0x330) {
+ if (option & 0x330) {
/* FIXME: shouldn't someone check this variable? */
/* np->medialock = 1; */
printk(KERN_INFO " Forcing %dMbs %s-duplex operation.\n",
@@ -1683,8 +1683,9 @@
printk(KERN_INFO "%s: Tx descriptor write-back race.\n",
dev->name);
}
- if ((intr_status & IntrTxError) && ~( IntrTxAborted | IntrTxUnderrun |
- IntrTxDescRace )) {
+ if ((intr_status & IntrTxError) &&
+ (intr_status & ( IntrTxAborted |
+ IntrTxUnderrun | IntrTxDescRace )) == 0) {
if (np->tx_thresh < 0xE0) {
writeb(np->tx_thresh += 0x20, ioaddr + TxConfig);
}
next prev parent reply other threads:[~2004-05-23 10:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-23 10:46 [0/4] via-rhine: clean-up for 2.6 Roger Luethi
2004-05-23 10:48 ` Roger Luethi [this message]
2004-05-27 19:09 ` [1/4][PATCH 2.6] via-rhine: Fix force media Jeff Garzik
2004-05-23 10:50 ` [2/4][PATCH 2.6] via-rhine: Rename some symbols Roger Luethi
2004-05-23 10:50 ` [3/4][PATCH 2.6] via-rhine: Whitespace clean-up Roger Luethi
2004-05-23 10:50 ` [4/4][PATCH 2.6] via-rhine: USE_MEM, USE_IO -> USE_MMIO Roger Luethi
2004-05-23 14:52 ` [5/4][PATCH 2.6] via-rhine: netdev_priv() Roger Luethi
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=20040523104859.GA10091@k3.hellgate.ch \
--to=rl@hellgate.ch \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@hellgate.ch \
/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