diff --git a/[refs] b/[refs]
index e5e46f3b8888..44bf12fd4d27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b84981c80847999c23a87b9e6810978ccf14f14e
+refs/heads/master: cd9bb52bfadf31ca51a5b67d967ec06061ac4b04
diff --git a/trunk/drivers/staging/et131x/et1310_phy.c b/trunk/drivers/staging/et131x/et1310_phy.c
index 3c82f44a9615..c4bc41dd185b 100644
--- a/trunk/drivers/staging/et131x/et1310_phy.c
+++ b/trunk/drivers/staging/et131x/et1310_phy.c
@@ -498,10 +498,8 @@ void et131x_mii_check(struct et131x_adapter *adapter,
 		}
 	}
 
-	if ((bmsr_ints & BMSR_ANEGCOMPLETE) ||
-	   (adapter->ai_force_duplex == 3 && (bmsr_ints & BMSR_LSTATUS))) {
-		if ((bmsr & BMSR_ANEGCOMPLETE) ||
-		    adapter->ai_force_duplex == 3) {
+	if (bmsr_ints & BMSR_ANEGCOMPLETE) {
+		if (bmsr & BMSR_ANEGCOMPLETE) {
 			et1310_phy_link_status(adapter,
 					     &link_status, &autoneg_status,
 					     &speed, &duplex, &mdi_mdix,
diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h
index 292a7719b599..78f2894d76e8 100644
--- a/trunk/drivers/staging/et131x/et131x_adapter.h
+++ b/trunk/drivers/staging/et131x/et131x_adapter.h
@@ -181,8 +181,6 @@ struct et131x_adapter {
 	u32 registry_jumbo_packet;	/* Max supported ethernet packet size */
 
 	/* Derived from the registry: */
-	u8 ai_force_duplex;	/* duplex setting */
-	u16 ai_force_speed;	/* 'Speed', user over-ride of line speed */
 	u8 flowcontrol;		/* flow control validated by the far-end */
 
 	/* Minimize init-time */