diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2012-02-22 04:02:26 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-25 00:34:15 -0500 |
commit | 1a46b40fbb1dfd698efbc7a9575aa64aed04d568 (patch) | |
tree | 46e479dcc8a92756cf91711d1b548c6ec6773572 /drivers/net/ethernet/intel/e1000e/ich8lan.c | |
parent | d1964eb138901286a170de8ed422efd227dd4daf (diff) |
e1000e: cleanup: rename e1000e_setup_link() and call as function pointer
Rename e1000e_setup_link() to e1000e_setup_link_generic() to signify the
function is used for more than one MAC-family type. The 82571-family has
a custom setup_link function which also calls the generic function. The
ich8lan-family has a custom function which should just be called via the
function pointer. The 80003es2lan-family just uses the generic function.
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/ich8lan.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 7d3a7fb11dd3..8b9bf94f9887 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c | |||
@@ -3212,7 +3212,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw) | |||
3212 | } | 3212 | } |
3213 | 3213 | ||
3214 | /* Setup link and flow control */ | 3214 | /* Setup link and flow control */ |
3215 | ret_val = e1000_setup_link_ich8lan(hw); | 3215 | ret_val = mac->ops.setup_link(hw); |
3216 | 3216 | ||
3217 | /* Set the transmit descriptor write-back policy for both queues */ | 3217 | /* Set the transmit descriptor write-back policy for both queues */ |
3218 | txdctl = er32(TXDCTL(0)); | 3218 | txdctl = er32(TXDCTL(0)); |