diff options
| author |  Bruce Allan <bruce.w.allan@intel.com>
| 2012-02-22 09:02:26 +0000 |
|---|---|---|
| committer |  Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| 2012-02-24 21:34:15 -0800 |
| commit | 1a46b40fbb1dfd698efbc7a9575aa64aed04d568 (patch) | |
| tree | 46e479dcc8a92756cf91711d1b548c6ec6773572 /drivers/net/ethernet/intel/e1000e/80003es2lan.c | |
| parent | e1000e: cleanup: rename e1000e_id_led_init() and call as function pointer (diff) | |
| download | linux-1a46b40fbb1dfd698efbc7a9575aa64aed04d568.tar.gz linux-1a46b40fbb1dfd698efbc7a9575aa64aed04d568.tar.bz2 linux-1a46b40fbb1dfd698efbc7a9575aa64aed04d568.zip | |
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/80003es2lan.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/80003es2lan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c index c1464845439d..e1cbead69409 100644 --- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c +++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c @@ -838,7 +838,7 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0); /* Setup link and flow control */ - ret_val = e1000e_setup_link(hw); + ret_val = mac->ops.setup_link(hw); /* Disable IBIST slave mode (far-end loopback) */ e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM, @@ -1429,7 +1429,7 @@ static const struct e1000_mac_operations es2_mac_ops = { .clear_vfta = e1000_clear_vfta_generic, .reset_hw = e1000_reset_hw_80003es2lan, .init_hw = e1000_init_hw_80003es2lan, - .setup_link = e1000e_setup_link, + .setup_link = e1000e_setup_link_generic, /* setup_physical_interface dependent on media type */ .setup_led = e1000e_setup_led_generic, }; |