From d63057d5c8b4845911c40292210a70766cb545dc Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Sat, 30 Jul 2005 13:16:14 +0200 Subject: [PATCH] --- yaml --- r: 6598 b: refs/heads/master c: 8348b4db5f56d2c0d3849db06055225ec15b255a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sis190.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 29a368d54395..946f3d35a5d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 560d3d521decc6d05dc0d6e007f1d2e1d3048102 +refs/heads/master: 8348b4db5f56d2c0d3849db06055225ec15b255a diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c index 84bc2299f93b..915ff009c295 100644 --- a/trunk/drivers/net/sis190.c +++ b/trunk/drivers/net/sis190.c @@ -952,12 +952,17 @@ static void sis190_phy_task(void * data) 0x01 | _10bpsH }, { 0, "unknown", 0x0000 } }, *p; + u16 adv; val = mdio_read(ioaddr, phy_id, 0x1f); net_link(tp, KERN_INFO "%s: mii ext = %04x.\n", dev->name, val); val = mdio_read(ioaddr, phy_id, MII_LPA); - net_link(tp, KERN_INFO "%s: mii lpa = %04x.\n", dev->name, val); + adv = mdio_read(ioaddr, phy_id, MII_ADVERTISE); + net_link(tp, KERN_INFO "%s: mii lpa = %04x adv = %04x.\n", + dev->name, val, adv); + + val &= adv; for (p = reg31; p->ctl; p++) { if ((val & p->val) == p->val)