diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-09-04 10:24:42 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 23:54:58 (GMT) |
| commit | cd9bb52bfadf31ca51a5b67d967ec06061ac4b04 (patch) | |
| tree | 9e5e58055e251b6592ebe72f50a1a1ff42f765a2 /drivers/staging | |
| parent | b84981c80847999c23a87b9e6810978ccf14f14e (diff) | |
| download | linux-fsl-qoriq-cd9bb52bfadf31ca51a5b67d967ec06061ac4b04.tar.xz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/et131x/et1310_phy.c | 6 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x_adapter.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 3c82f44..c4bc41d 100644 --- 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 292a771..78f2894 100644 --- 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 */ |