aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/tenxpress.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sfc/tenxpress.c')
-rw-r--r--drivers/net/sfc/tenxpress.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index 197b5449ab18..d60353bb40b6 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -1,6 +1,6 @@
1/**************************************************************************** 1/****************************************************************************
2 * Driver for Solarflare 802.3an compliant PHY 2 * Driver for Solarflare Solarstorm network controllers and boards
3 * Copyright 2007 Solarflare Communications Inc. 3 * Copyright 2007-2008 Solarflare Communications Inc.
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 as published 6 * under the terms of the GNU General Public License version 2 as published
@@ -15,7 +15,6 @@
15#include "phy.h" 15#include "phy.h"
16#include "falcon_hwdefs.h" 16#include "falcon_hwdefs.h"
17#include "boards.h" 17#include "boards.h"
18#include "mac.h"
19 18
20/* We expect these MMDs to be in the package */ 19/* We expect these MMDs to be in the package */
21/* AN not here as mdio_check_mmds() requires STAT2 support */ 20/* AN not here as mdio_check_mmds() requires STAT2 support */
@@ -381,7 +380,7 @@ static int tenxpress_phy_check_hw(struct efx_nic *efx)
381 link_ok = tenxpress_link_ok(efx, true); 380 link_ok = tenxpress_link_ok(efx, true);
382 381
383 if (link_ok != efx->link_up) 382 if (link_ok != efx->link_up)
384 falcon_xmac_sim_phy_event(efx); 383 falcon_sim_phy_event(efx);
385 384
386 if (phy_data->phy_mode != PHY_MODE_NORMAL) 385 if (phy_data->phy_mode != PHY_MODE_NORMAL)
387 return 0; 386 return 0;
@@ -453,12 +452,15 @@ static int tenxpress_phy_test(struct efx_nic *efx)
453} 452}
454 453
455struct efx_phy_operations falcon_tenxpress_phy_ops = { 454struct efx_phy_operations falcon_tenxpress_phy_ops = {
455 .macs = EFX_XMAC,
456 .init = tenxpress_phy_init, 456 .init = tenxpress_phy_init,
457 .reconfigure = tenxpress_phy_reconfigure, 457 .reconfigure = tenxpress_phy_reconfigure,
458 .check_hw = tenxpress_phy_check_hw, 458 .check_hw = tenxpress_phy_check_hw,
459 .fini = tenxpress_phy_fini, 459 .fini = tenxpress_phy_fini,
460 .clear_interrupt = tenxpress_phy_clear_interrupt, 460 .clear_interrupt = tenxpress_phy_clear_interrupt,
461 .test = tenxpress_phy_test, 461 .test = tenxpress_phy_test,
462 .get_settings = mdio_clause45_get_settings,
463 .set_settings = mdio_clause45_set_settings,
462 .mmds = TENXPRESS_REQUIRED_DEVS, 464 .mmds = TENXPRESS_REQUIRED_DEVS,
463 .loopbacks = TENXPRESS_LOOPBACKS, 465 .loopbacks = TENXPRESS_LOOPBACKS,
464}; 466};