aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/tenxpress.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-12-13 00:43:33 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-13 00:57:57 -0500
commitf31a45d2f45a7667acd6e85ab6613b0910c55ea9 (patch)
tree0462d02420800b22af5291db8a210888da9e2683 /drivers/net/sfc/tenxpress.c
parent5005087728e37db133fee05bb0923c50e673ae99 (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/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 @@
10#include <linux/delay.h> 10#include <linux/delay.h>
11#include <linux/seq_file.h> 11#include <linux/seq_file.h>
12#include "efx.h" 12#include "efx.h"
13#include "gmii.h"
14#include "mdio_10g.h" 13#include "mdio_10g.h"
15#include "falcon.h" 14#include "falcon.h"
16#include "phy.h" 15#include "phy.h"
@@ -362,7 +361,8 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)
362 phy_data->loopback_mode = efx->loopback_mode; 361 phy_data->loopback_mode = efx->loopback_mode;
363 phy_data->phy_mode = efx->phy_mode; 362 phy_data->phy_mode = efx->phy_mode;
364 efx->link_up = tenxpress_link_ok(efx, false); 363 efx->link_up = tenxpress_link_ok(efx, false);
365 efx->link_options = GM_LPA_10000FULL; 364 efx->link_speed = 10000;
365 efx->link_fd = true;
366} 366}
367 367
368static void tenxpress_phy_clear_interrupt(struct efx_nic *efx) 368static void tenxpress_phy_clear_interrupt(struct efx_nic *efx)