staging: et131x: Remove ai_force_[duplex|speed] from et131x_adapter

The ai_force settings were used to set the ethernet speed and duplex manually.
This is now being done by the phy_device, so remove.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c
index 3c82f44a9615f35e760c57148d52653e123e188e..c4bc41dd185bd6db22189d745c67ff9111f59ab5 100644 (file)
--- a/drivers/staging/et131x/et1310_phy.c
+++ b/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/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index 292a7719b599655dc396fb95dd4750eec1ce31ec..78f2894d76e855b839563b931cfbb4d59ba10275 100644 (file)
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/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 */