summaryrefslogtreecommitdiff
path: root/drivers/staging/et131x/et1310_phy.c
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2011-09-04 11:24:33 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-06 16:54:54 -0700
commit06530d81d6a6b9cccd6433868fc0bb68fe0361e3 (patch)
treee183dad1e7be96887efa4ee8f1e6cc067fe43223 /drivers/staging/et131x/et1310_phy.c
parent412f8e0c52b126c6f54d0626a9dede9438d76c03 (diff)
downloadlinux-3.10-06530d81d6a6b9cccd6433868fc0bb68fe0361e3.tar.gz
linux-3.10-06530d81d6a6b9cccd6433868fc0bb68fe0361e3.tar.bz2
linux-3.10-06530d81d6a6b9cccd6433868fc0bb68fe0361e3.zip
staging: et131x: Remove private adapter->duplex_mode and use phydev->duplex instead
The phy device keeps a note of the duplex mode, so use that value instead of duplex mode. Also use the phydev defines for duplex modes, and remove the driver private ones. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_phy.c')
-rw-r--r--drivers/staging/et131x/et1310_phy.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c
index c5d0d02f4ca..41f0afa4a13 100644
--- a/drivers/staging/et131x/et1310_phy.c
+++ b/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) {