From cbe0ce8f450adc00ebca025dcce10c624e51f348 Mon Sep 17 00:00:00 2001
From: Mark Einon <mark.einon@gmail.com>
Date: Sun, 4 Sep 2011 11:24:33 +0100
Subject: [PATCH] --- yaml --- r: 268267 b: refs/heads/master c:
 06530d81d6a6b9cccd6433868fc0bb68fe0361e3 h: refs/heads/master i:   268265:
 c9eb8ab3388d9301b4df72c9a6b2cda3de298ed1   268263:
 2d741dfacd7c90fc7576b9bb1be2d6d6b31299b5 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/et131x/et1310_mac.c     | 8 +++++---
 trunk/drivers/staging/et131x/et1310_phy.c     | 4 ----
 trunk/drivers/staging/et131x/et1310_phy.h     | 4 ----
 trunk/drivers/staging/et131x/et131x_adapter.h | 1 -
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 3fb5cdbb3dff..5800d6b67f95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 412f8e0c52b126c6f54d0626a9dede9438d76c03
+refs/heads/master: 06530d81d6a6b9cccd6433868fc0bb68fe0361e3
diff --git a/trunk/drivers/staging/et131x/et1310_mac.c b/trunk/drivers/staging/et131x/et1310_mac.c
index efabc038bb4e..08d7691ce19d 100644
--- a/trunk/drivers/staging/et131x/et1310_mac.c
+++ b/trunk/drivers/staging/et131x/et1310_mac.c
@@ -205,11 +205,11 @@ void et1310_config_mac_regs2(struct et131x_adapter *adapter)
 	cfg2 &= ~0x0021;
 
 	/* Turn on duplex if needed */
-	if (adapter->duplex_mode)
+	if (phydev && phydev->duplex == DUPLEX_FULL)
 		cfg2 |= 0x01;
 
 	ifctrl &= ~(1 << 26);
-	if (!adapter->duplex_mode)
+	if (phydev && phydev->duplex == DUPLEX_HALF)
 		ifctrl |= (1<<26);	/* Enable ghd */
 
 	writel(ifctrl, &mac->if_ctrl);
@@ -450,7 +450,9 @@ void et1310_config_macstat_regs(struct et131x_adapter *adapter)
 
 void et1310_config_flow_control(struct et131x_adapter *adapter)
 {
-	if (adapter->duplex_mode == 0) {
+	struct phy_device *phydev = adapter->phydev;
+
+	if (phydev->duplex == DUPLEX_HALF) {
 		adapter->flowcontrol = FLOW_NONE;
 	} else {
 		char remote_pause, remote_async_pause;
diff --git a/trunk/drivers/staging/et131x/et1310_phy.c b/trunk/drivers/staging/et131x/et1310_phy.c
index c5d0d02f4ca1..41f0afa4a13c 100644
--- a/trunk/drivers/staging/et131x/et1310_phy.c
+++ b/trunk/drivers/staging/et131x/et1310_phy.c
@@ -477,8 +477,6 @@ void et131x_mii_check(struct et131x_adapter *adapter,
 
 			netif_carrier_off(adapter->netdev);
 
-			adapter->duplex_mode = 0;
-
 			/* Free the packets being actively sent & stopped */
 			et131x_free_busy_send_packets(adapter);
 
@@ -516,8 +514,6 @@ void et131x_mii_check(struct et131x_adapter *adapter,
 					     &speed, &duplex, &mdi_mdix,
 					     &masterslave, &polarity);
 
-			adapter->duplex_mode = duplex;
-
 			adapter->boot_coma = 20;
 
 			if (phydev && phydev->speed == SPEED_10) {
diff --git a/trunk/drivers/staging/et131x/et1310_phy.h b/trunk/drivers/staging/et131x/et1310_phy.h
index 3e95c66dfde8..d996e8e746c9 100644
--- a/trunk/drivers/staging/et131x/et1310_phy.h
+++ b/trunk/drivers/staging/et131x/et1310_phy.h
@@ -242,10 +242,6 @@ struct mi_regs {
 #define TRUEPHY_MASK                    2
 #endif
 
-/* Define duplex modes */
-#define TRUEPHY_DUPLEX_HALF             0
-#define TRUEPHY_DUPLEX_FULL             1
-
 /* Define master/slave configuration values */
 #define TRUEPHY_CFG_SLAVE               0
 #define TRUEPHY_CFG_MASTER              1
diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h
index 1e65e798282b..a63f3768daa1 100644
--- a/trunk/drivers/staging/et131x/et131x_adapter.h
+++ b/trunk/drivers/staging/et131x/et131x_adapter.h
@@ -169,7 +169,6 @@ struct et131x_adapter {
 
 	/* Packet Filter and look ahead size */
 	u32 packet_filter;
-	u32 duplex_mode;
 
 	/* multicast list */
 	u32 multicast_addr_count;