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/mac.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/mac.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c index aaf4a4d731b6..6e48895aa2ef 100644 --- a/drivers/net/ethernet/intel/e1000e/mac.c +++ b/drivers/net/ethernet/intel/e1000e/mac.c | |||
@@ -693,7 +693,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw) | |||
693 | } | 693 | } |
694 | 694 | ||
695 | /** | 695 | /** |
696 | * e1000e_setup_link - Setup flow control and link settings | 696 | * e1000e_setup_link_generic - Setup flow control and link settings |
697 | * @hw: pointer to the HW structure | 697 | * @hw: pointer to the HW structure |
698 | * | 698 | * |
699 | * Determines which flow control settings to use, then configures flow | 699 | * Determines which flow control settings to use, then configures flow |
@@ -702,7 +702,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw) | |||
702 | * should be established. Assumes the hardware has previously been reset | 702 | * should be established. Assumes the hardware has previously been reset |
703 | * and the transmitter and receiver are not enabled. | 703 | * and the transmitter and receiver are not enabled. |
704 | **/ | 704 | **/ |
705 | s32 e1000e_setup_link(struct e1000_hw *hw) | 705 | s32 e1000e_setup_link_generic(struct e1000_hw *hw) |
706 | { | 706 | { |
707 | struct e1000_mac_info *mac = &hw->mac; | 707 | struct e1000_mac_info *mac = &hw->mac; |
708 | s32 ret_val; | 708 | s32 ret_val; |