diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-29 15:08:55 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-29 17:23:53 -0800 |
| commit | c1c4f453b61463df4df16f7aa5782fc0cfe05b9e (patch) | |
| tree | a72b533294500e7f19ab1f67142b732471df53cb /drivers/net/sfc/mdio_10g.c | |
| parent | e58f69f4082f60076885798fae8f3a17ea713bf6 (diff) | |
sfc: Remove static PHY data and enumerations
New NICs have firmware managing the PHY, and we will discover the PHY
capabilities at run-time. Replace the static data with probe() and
test_name() operations.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/mdio_10g.c')
| -rw-r--r-- | drivers/net/sfc/mdio_10g.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c index e6ca988abbb5..20e627431d27 100644 --- a/drivers/net/sfc/mdio_10g.c +++ b/drivers/net/sfc/mdio_10g.c @@ -15,6 +15,7 @@ #include "net_driver.h" #include "mdio_10g.h" #include "workarounds.h" +#include "falcon.h" unsigned efx_mdio_id_oui(u32 id) { @@ -312,8 +313,7 @@ void efx_mdio_an_reconfigure(struct efx_nic *efx) /* Enable and restart AN */ reg = efx_mdio_read(efx, MDIO_MMD_AN, MDIO_CTRL1); reg |= MDIO_AN_CTRL1_ENABLE; - if (!(EFX_WORKAROUND_15195(efx) && - LOOPBACK_MASK(efx) & efx->phy_op->loopbacks)) + if (!(EFX_WORKAROUND_15195(efx) && LOOPBACK_EXTERNAL(efx))) reg |= MDIO_AN_CTRL1_RESTART; if (xnp) reg |= MDIO_AN_CTRL1_XNP; |