diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-05 19:06:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-05 19:06:45 -0700 |
| commit | 6b1344724e10c166d9e3c17011ed879ddf302e94 (patch) | |
| tree | bbfa98b183c1249a58ad2debdb696392d8c4a029 /drivers/net/ixgbe/ixgbe_phy.c | |
| parent | 8e4a718ff38d8539938ec3421935904c27e00c39 (diff) | |
| parent | 1ded3f59f35a2642852b3e2a1c0fa8a97777e9af (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_phy.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_phy.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c index 453e966762f..9ecad17522c 100644 --- a/drivers/net/ixgbe/ixgbe_phy.c +++ b/drivers/net/ixgbe/ixgbe_phy.c @@ -60,6 +60,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw) if (hw->phy.type == ixgbe_phy_unknown) { for (phy_addr = 0; phy_addr < IXGBE_MAX_PHY_ADDR; phy_addr++) { + hw->phy.mdio.prtad = phy_addr; if (mdio45_probe(&hw->phy.mdio, phy_addr) == 0) { ixgbe_get_phy_id(hw); hw->phy.type = @@ -68,6 +69,8 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw) break; } } + /* clear value if nothing found */ + hw->phy.mdio.prtad = 0; } else { status = 0; } |