diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-13 00:43:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-13 00:57:57 -0500 |
commit | f31a45d2f45a7667acd6e85ab6613b0910c55ea9 (patch) | |
tree | 0462d02420800b22af5291db8a210888da9e2683 /drivers/net/sfc/xfp_phy.c | |
parent | 5005087728e37db133fee05bb0923c50e673ae99 (diff) |
sfc: Remove MII extension cruft
Replace efx_nic::link_options bitfield with link_speed (speed in
Mbit/s) and link_fd (full duplex flag).
Remove broken auto-negotiation functions.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/xfp_phy.c')
-rw-r--r-- | drivers/net/sfc/xfp_phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c index 91f024662101..971a24b59fa7 100644 --- a/drivers/net/sfc/xfp_phy.c +++ b/drivers/net/sfc/xfp_phy.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/timer.h> | 14 | #include <linux/timer.h> |
15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
16 | #include "efx.h" | 16 | #include "efx.h" |
17 | #include "gmii.h" | ||
18 | #include "mdio_10g.h" | 17 | #include "mdio_10g.h" |
19 | #include "xenpack.h" | 18 | #include "xenpack.h" |
20 | #include "phy.h" | 19 | #include "phy.h" |
@@ -154,7 +153,8 @@ static void xfp_phy_reconfigure(struct efx_nic *efx) | |||
154 | 153 | ||
155 | phy_data->phy_mode = efx->phy_mode; | 154 | phy_data->phy_mode = efx->phy_mode; |
156 | efx->link_up = xfp_link_ok(efx); | 155 | efx->link_up = xfp_link_ok(efx); |
157 | efx->link_options = GM_LPA_10000FULL; | 156 | efx->link_speed = 10000; |
157 | efx->link_fd = true; | ||
158 | } | 158 | } |
159 | 159 | ||
160 | 160 | ||