---

yaml --- r: 6598 b: refs/heads/master c: 8348b4d h: refs/heads/master v: v3
git-mirror · Jul 30, 2005 · d63057d · d63057d
1 parent 9a9cbe3
commit d63057d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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)