aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/tenxpress.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-12-12 21:43:33 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-12 21:57:57 -0800
commitf31a45d2f45a7667acd6e85ab6613b0910c55ea9 (patch)
tree0462d02420800b22af5291db8a210888da9e2683 /drivers/net/sfc/tenxpress.c
parentsfc: Don't count RX checksum errors during loopback self-test (diff)
downloadlinux-dev-f31a45d2f45a7667acd6e85ab6613b0910c55ea9.tar.xz
linux-dev-f31a45d2f45a7667acd6e85ab6613b0910c55ea9.zip
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/tenxpress.c')
-rw-r--r--drivers/net/sfc/tenxpress.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index 8d41c29b9d7b..3fa7ccb08d50 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -10,7 +10,6 @@
#include <linux/delay.h>
#include <linux/seq_file.h>
#include "efx.h"
-#include "gmii.h"
#include "mdio_10g.h"
#include "falcon.h"
#include "phy.h"
@@ -362,7 +361,8 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)
phy_data->loopback_mode = efx->loopback_mode;
phy_data->phy_mode = efx->phy_mode;
efx->link_up = tenxpress_link_ok(efx, false);
- efx->link_options = GM_LPA_10000FULL;
+ efx->link_speed = 10000;
+ efx->link_fd = true;
}
static void tenxpress_phy_clear_interrupt(struct efx_nic *efx)