---

yaml --- r: 150324 b: refs/heads/master c: 381f051 h: refs/heads/master v: v3
git-mirror · May 19, 2009 · eda2622 · eda2622
1 parent b710c77
commit eda2622
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b2d850db275a8934db7e09d79a716435c7b3e0c
+refs/heads/master: 381f05172bdca076390abd84813b09ea423ae8a9
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
@@ -479,7 +479,6 @@ struct rtl8169_private {
 	u16 intr_event;
 	u16 napi_event;
 	u16 intr_mask;
-	int phy_auto_nego_reg;
 	int phy_1000_ctrl_reg;
 #ifdef CONFIG_R8169_VLAN
 	struct vlan_group *vlgrp;
@@ -908,7 +907,6 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
 		mdio_write(ioaddr, 0x0e, 0x0000);
 	}
 
-	tp->phy_auto_nego_reg = auto_nego;
 	tp->phy_1000_ctrl_reg = giga_ctrl;
 
 	mdio_write(ioaddr, MII_ADVERTISE, auto_nego);