diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-04-29 04:11:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-29 20:32:33 -0400 |
commit | cdbf0eb478dd4c76aa665c80976837dc58367f52 (patch) | |
tree | c0648b693df25a0432078232d9772be2737e0b6a /drivers/net/ixgb/ixgb_hw.c | |
parent | 6b73e10d2d89f9ce773f9b47d61b195936d059ba (diff) |
ixgb: Use generic MDIO definitions
Compile-tested only.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgb/ixgb_hw.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_hw.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c index 11dcda0f453e..ff67a84e6802 100644 --- a/drivers/net/ixgb/ixgb_hw.c +++ b/drivers/net/ixgb/ixgb_hw.c | |||
@@ -192,7 +192,7 @@ ixgb_identify_xpak_vendor(struct ixgb_hw *hw) | |||
192 | vendor_name[i] = ixgb_read_phy_reg(hw, | 192 | vendor_name[i] = ixgb_read_phy_reg(hw, |
193 | MDIO_PMA_PMD_XPAK_VENDOR_NAME | 193 | MDIO_PMA_PMD_XPAK_VENDOR_NAME |
194 | + i, IXGB_PHY_ADDRESS, | 194 | + i, IXGB_PHY_ADDRESS, |
195 | MDIO_PMA_PMD_DID); | 195 | MDIO_MMD_PMAPMD); |
196 | } | 196 | } |
197 | 197 | ||
198 | /* Determine the actual vendor */ | 198 | /* Determine the actual vendor */ |
@@ -1225,15 +1225,15 @@ ixgb_optics_reset(struct ixgb_hw *hw) | |||
1225 | u16 mdio_reg; | 1225 | u16 mdio_reg; |
1226 | 1226 | ||
1227 | ixgb_write_phy_reg(hw, | 1227 | ixgb_write_phy_reg(hw, |
1228 | MDIO_PMA_PMD_CR1, | 1228 | MDIO_CTRL1, |
1229 | IXGB_PHY_ADDRESS, | 1229 | IXGB_PHY_ADDRESS, |
1230 | MDIO_PMA_PMD_DID, | 1230 | MDIO_MMD_PMAPMD, |
1231 | MDIO_PMA_PMD_CR1_RESET); | 1231 | MDIO_CTRL1_RESET); |
1232 | 1232 | ||
1233 | mdio_reg = ixgb_read_phy_reg( hw, | 1233 | mdio_reg = ixgb_read_phy_reg(hw, |
1234 | MDIO_PMA_PMD_CR1, | 1234 | MDIO_CTRL1, |
1235 | IXGB_PHY_ADDRESS, | 1235 | IXGB_PHY_ADDRESS, |
1236 | MDIO_PMA_PMD_DID); | 1236 | MDIO_MMD_PMAPMD); |
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | return; | 1239 | return; |