aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/phy.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-02-22 04:02:58 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-02-25 00:39:52 -0500
commit57cde7630c1911ea7e8e1561cccfde8096e8bcc7 (patch)
tree36a8dbfb7fcf6a72eaa0f39856f7159d90d17173 /drivers/net/ethernet/intel/e1000e/phy.c
parent6e3c807504a573aba1ff5aad99e235d04ac72269 (diff)
e1000e: rename e1000e_config_collision_dist() and call as function pointer
Rename e1000e_config_collision_dist() to e1000e_config_collision_dist_generic() to signify the function is used for more than one MAC-family type, and set and use it as a MAC ops function pointer to be consistent with the driver design. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/phy.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/phy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index d10b27fee201..683abac4a049 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1181,7 +1181,7 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
1181 1181
1182 if (link) { 1182 if (link) {
1183 e_dbg("Valid link established!!!\n"); 1183 e_dbg("Valid link established!!!\n");
1184 e1000e_config_collision_dist(hw); 1184 hw->mac.ops.config_collision_dist(hw);
1185 ret_val = e1000e_config_fc_after_link_up(hw); 1185 ret_val = e1000e_config_fc_after_link_up(hw);
1186 } else { 1186 } else {
1187 e_dbg("Unable to establish link!!!\n"); 1187 e_dbg("Unable to establish link!!!\n");
@@ -1489,7 +1489,7 @@ void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
1489 e_dbg("Forcing 10mb\n"); 1489 e_dbg("Forcing 10mb\n");
1490 } 1490 }
1491 1491
1492 e1000e_config_collision_dist(hw); 1492 hw->mac.ops.config_collision_dist(hw);
1493 1493
1494 ew32(CTRL, ctrl); 1494 ew32(CTRL, ctrl);
1495} 1495}