From: Andrew Morton <akpm@osdl.org>
To: Dominik Karall <dominik.karall@gmx.net>
Cc: linux-kernel@vger.kernel.org
Subject: Re: 2.6.7-mm1
Date: Mon, 21 Jun 2004 04:00:29 -0700 [thread overview]
Message-ID: <20040621040029.48367636.akpm@osdl.org> (raw)
In-Reply-To: <200406211248.08190.dominik.karall@gmx.net>
Dominik Karall <dominik.karall@gmx.net> wrote:
>
> On Monday 21 June 2004 02:46, Andrew Morton wrote:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.7/2.6.7-m
> >m1/
>
> My network does not work with this patch.
Bummer. Does this reversion fix it?
diff -puN drivers/net/sis900.c~a drivers/net/sis900.c
--- 25/drivers/net/sis900.c~a 2004-06-21 04:00:05.242017088 -0700
+++ 25-akpm/drivers/net/sis900.c 2004-06-21 04:00:07.832623256 -0700
@@ -116,7 +116,6 @@ static struct mii_chip_info {
#define HOME 0x0001
#define LAN 0x0002
#define MIX 0x0003
-#define UNKNOWN 0x0
} mii_chip_table[] = {
{ "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN },
{ "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN },
@@ -578,11 +577,9 @@ static int __init sis900_mii_probe (stru
break;
}
- if( !mii_chip_table[i].phy_id1 ) {
+ if( !mii_chip_table[i].phy_id1 )
printk(KERN_INFO "%s: Unknown PHY transceiver found at address %d.\n",
- net_dev->name, phy_addr);
- mii_phy->phy_types = UNKNOWN;
- }
+ net_dev->name, phy_addr);
}
if (sis_priv->mii == NULL) {
@@ -647,15 +644,15 @@ static int __init sis900_mii_probe (stru
static u16 sis900_default_phy(struct net_device * net_dev)
{
struct sis900_private * sis_priv = net_dev->priv;
- struct mii_phy *phy = NULL, *phy_home = NULL, *default_phy = NULL, *phy_lan = NULL;
+ struct mii_phy *phy = NULL, *phy_home = NULL, *default_phy = NULL;
u16 status;
for( phy=sis_priv->first_mii; phy; phy=phy->next ){
status = mdio_read(net_dev, phy->phy_addr, MII_STATUS);
status = mdio_read(net_dev, phy->phy_addr, MII_STATUS);
- /* Link ON & Not select default PHY & not ghost PHY */
- if ( (status & MII_STAT_LINK) && !default_phy && (phy->phy_types != UNKNOWN) )
+ /* Link ON & Not select deafalut PHY */
+ if ( (status & MII_STAT_LINK) && !(default_phy) )
default_phy = phy;
else{
status = mdio_read(net_dev, phy->phy_addr, MII_CONTROL);
@@ -663,16 +660,12 @@ static u16 sis900_default_phy(struct net
status | MII_CNTL_AUTO | MII_CNTL_ISOLATE);
if( phy->phy_types == HOME )
phy_home = phy;
- else if (phy->phy_types == LAN)
- phy_lan = phy;
}
}
- if( !default_phy && phy_home )
+ if( (!default_phy) && phy_home )
default_phy = phy_home;
- else if( !default_phy && phy_lan )
- default_phy = phy_lan;
- else if ( !default_phy )
+ else if(!default_phy)
default_phy = sis_priv->first_mii;
if( sis_priv->mii != default_phy ){
_
next prev parent reply other threads:[~2004-06-21 11:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-06-21 0:46 2.6.7-mm1 Andrew Morton
2004-06-21 1:40 ` 2.6.7-mm1: empty help text for FB_RIVA_I2C Adrian Bunk
2004-06-21 7:38 ` Antonino A. Daplas
2004-06-21 1:43 ` [patch] 2.6.7-mm1: R8169_NAPI help text Adrian Bunk
2004-06-21 1:55 ` [patch] 2.6.7-mm1: drivers/scsi/hosts.h -> scsi/scsi_host.h Adrian Bunk
2004-06-22 3:48 ` Jeff Garzik
2004-06-21 2:04 ` 2.6.7-mm1 Adrian Bunk
2004-06-22 5:33 ` 2.6.7-mm1 Sam Ravnborg
2004-07-17 20:46 ` [2.6 patch] move STANDALONE to drivers/base/Kconfig Adrian Bunk
2004-06-21 2:06 ` 2.6.7-mm1 linker trouble with CONFIG_FB_RIVA_I2C=y and modular I2C Matthias Andree
2004-06-21 15:29 ` [patch] " Adrian Bunk
2004-06-22 15:11 ` Matthias Andree
2004-06-21 10:48 ` 2.6.7-mm1 Dominik Karall
2004-06-21 11:00 ` Andrew Morton [this message]
2004-06-21 11:43 ` 2.6.7-mm1 Dominik Karall
2004-06-23 7:28 ` 2.6.7-mm1 Daniele Venzano
2004-06-21 11:48 ` 2.6.7-mm1 Eric BEGOT
2004-06-21 14:25 ` 2.6.7-mm1 James Morris
2004-06-21 14:38 ` 2.6.7-mm1 Eric BEGOT
2004-06-22 0:15 ` 2.6.7-mm1 Adrian Bunk
2004-06-21 14:32 ` 2.6.7-mm1 (compile stats) John Cherry
2004-06-21 23:05 ` 2.6.7-mm1 I/O regression ? FabF
2004-06-21 23:18 ` FabF
2004-06-21 19:57 2.6.7-mm1 Luca Risolia
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=20040621040029.48367636.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=dominik.karall@gmx.net \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®