diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-12 21:44:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-12 21:57:58 -0800 |
| commit | 27dd2caca4eabe7c13a052b7456495ba75535e6a (patch) | |
| tree | 514e7844ab78e5110e09d1e4a650e3283cdd32e9 /drivers/net/sfc/xfp_phy.c | |
| parent | f31a45d2f45a7667acd6e85ab6613b0910c55ea9 (diff) | |
| download | linux-27dd2caca4eabe7c13a052b7456495ba75535e6a.tar.gz linux-27dd2caca4eabe7c13a052b7456495ba75535e6a.tar.bz2 linux-27dd2caca4eabe7c13a052b7456495ba75535e6a.zip | |
sfc: Add support for MMDs numbered >15
Combine DEVS0 and DEVS1 registers into a 32-bit mask instead of
reading just DEVS0.
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c index 971a24b59fa7..0413d135e4aa 100644 --- a/drivers/net/sfc/xfp_phy.c +++ b/drivers/net/sfc/xfp_phy.c @@ -19,9 +19,9 @@ #include "phy.h" #include "mac.h" -#define XFP_REQUIRED_DEVS (MDIO_MMDREG_DEVS0_PCS | \ - MDIO_MMDREG_DEVS0_PMAPMD | \ - MDIO_MMDREG_DEVS0_PHYXS) +#define XFP_REQUIRED_DEVS (MDIO_MMDREG_DEVS_PCS | \ + MDIO_MMDREG_DEVS_PMAPMD | \ + MDIO_MMDREG_DEVS_PHYXS) #define XFP_LOOPBACKS ((1 << LOOPBACK_PCS) | \ (1 << LOOPBACK_PMAPMD) | \ @@ -64,7 +64,7 @@ static int xfp_reset_phy(struct efx_nic *efx) /* Check that all the MMDs we expect are present and responding. We * expect faults on some if the link is down, but not on the PHY XS */ rc = mdio_clause45_check_mmds(efx, XFP_REQUIRED_DEVS, - MDIO_MMDREG_DEVS0_PHYXS); + MDIO_MMDREG_DEVS_PHYXS); if (rc < 0) goto fail; |