aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/e1000.h
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2009-12-02 12:03:18 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-02 22:57:17 -0500
commit0be8401051c716be4533272e983b7eed3d83946d (patch)
tree930068efd2f9ed4ccf1529382f8c59b850f3294e /drivers/net/e1000e/e1000.h
parent5eb6f3c70fcc0fb19b9087863e6e29f96a76f3bd (diff)
e1000e: correct ICH/PCH PHY operations function pointers
Some function pointers for a few PHY operations (for 82578 and 82567) and were set incorrectly causing functions to be executed that were accessing incorrect PHY register offsets for that particular device. This patch also moves a few PHY-specific functions from ich8lan.c to the more appropriate phy.c. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
-rw-r--r--drivers/net/e1000e/e1000.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index b9f9e7836fad..cebbd9079d53 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -590,6 +590,12 @@ extern s32 e1000_get_phy_info_82577(struct e1000_hw *hw);
590extern s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw); 590extern s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw);
591extern s32 e1000_get_cable_length_82577(struct e1000_hw *hw); 591extern s32 e1000_get_cable_length_82577(struct e1000_hw *hw);
592 592
593extern s32 e1000_check_polarity_m88(struct e1000_hw *hw);
594extern s32 e1000_get_phy_info_ife(struct e1000_hw *hw);
595extern s32 e1000_check_polarity_ife(struct e1000_hw *hw);
596extern s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw);
597extern s32 e1000_check_polarity_igp(struct e1000_hw *hw);
598
593static inline s32 e1000_phy_hw_reset(struct e1000_hw *hw) 599static inline s32 e1000_phy_hw_reset(struct e1000_hw *hw)
594{ 600{
595 return hw->phy.ops.reset(hw); 601 return hw->phy.ops.reset(hw);