diff options
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/82571.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/82571.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c index b6b7bc4c33aa..086dad709179 100644 --- a/drivers/net/ethernet/intel/e1000e/82571.c +++ b/drivers/net/ethernet/intel/e1000e/82571.c | |||
@@ -1118,7 +1118,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) | |||
1118 | e1000_initialize_hw_bits_82571(hw); | 1118 | e1000_initialize_hw_bits_82571(hw); |
1119 | 1119 | ||
1120 | /* Initialize identification LED */ | 1120 | /* Initialize identification LED */ |
1121 | ret_val = e1000e_id_led_init(hw); | 1121 | ret_val = mac->ops.id_led_init(hw); |
1122 | if (ret_val) | 1122 | if (ret_val) |
1123 | e_dbg("Error initializing identification LED\n"); | 1123 | e_dbg("Error initializing identification LED\n"); |
1124 | /* This is not fatal and we should not stop init due to this */ | 1124 | /* This is not fatal and we should not stop init due to this */ |
@@ -1143,7 +1143,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) | |||
1143 | E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0); | 1143 | E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0); |
1144 | 1144 | ||
1145 | /* Setup link and flow control */ | 1145 | /* Setup link and flow control */ |
1146 | ret_val = e1000_setup_link_82571(hw); | 1146 | ret_val = mac->ops.setup_link(hw); |
1147 | 1147 | ||
1148 | /* Set the transmit descriptor write-back policy */ | 1148 | /* Set the transmit descriptor write-back policy */ |
1149 | reg_data = er32(TXDCTL(0)); | 1149 | reg_data = er32(TXDCTL(0)); |
@@ -1455,7 +1455,7 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw) | |||
1455 | break; | 1455 | break; |
1456 | } | 1456 | } |
1457 | 1457 | ||
1458 | return e1000e_setup_link(hw); | 1458 | return e1000e_setup_link_generic(hw); |
1459 | } | 1459 | } |
1460 | 1460 | ||
1461 | /** | 1461 | /** |
@@ -1911,7 +1911,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw) | |||
1911 | static const struct e1000_mac_operations e82571_mac_ops = { | 1911 | static const struct e1000_mac_operations e82571_mac_ops = { |
1912 | /* .check_mng_mode: mac type dependent */ | 1912 | /* .check_mng_mode: mac type dependent */ |
1913 | /* .check_for_link: media type dependent */ | 1913 | /* .check_for_link: media type dependent */ |
1914 | .id_led_init = e1000e_id_led_init, | 1914 | .id_led_init = e1000e_id_led_init_generic, |
1915 | .cleanup_led = e1000e_cleanup_led_generic, | 1915 | .cleanup_led = e1000e_cleanup_led_generic, |
1916 | .clear_hw_cntrs = e1000_clear_hw_cntrs_82571, | 1916 | .clear_hw_cntrs = e1000_clear_hw_cntrs_82571, |
1917 | .get_bus_info = e1000e_get_bus_info_pcie, | 1917 | .get_bus_info = e1000e_get_bus_info_pcie, |
@@ -1927,6 +1927,7 @@ static const struct e1000_mac_operations e82571_mac_ops = { | |||
1927 | .setup_link = e1000_setup_link_82571, | 1927 | .setup_link = e1000_setup_link_82571, |
1928 | /* .setup_physical_interface: media type dependent */ | 1928 | /* .setup_physical_interface: media type dependent */ |
1929 | .setup_led = e1000e_setup_led_generic, | 1929 | .setup_led = e1000e_setup_led_generic, |
1930 | .config_collision_dist = e1000e_config_collision_dist_generic, | ||
1930 | .read_mac_addr = e1000_read_mac_addr_82571, | 1931 | .read_mac_addr = e1000_read_mac_addr_82571, |
1931 | }; | 1932 | }; |
1932 | 1933 | ||
@@ -1988,6 +1989,7 @@ static const struct e1000_nvm_operations e82571_nvm_ops = { | |||
1988 | .acquire = e1000_acquire_nvm_82571, | 1989 | .acquire = e1000_acquire_nvm_82571, |
1989 | .read = e1000e_read_nvm_eerd, | 1990 | .read = e1000e_read_nvm_eerd, |
1990 | .release = e1000_release_nvm_82571, | 1991 | .release = e1000_release_nvm_82571, |
1992 | .reload = e1000e_reload_nvm_generic, | ||
1991 | .update = e1000_update_nvm_checksum_82571, | 1993 | .update = e1000_update_nvm_checksum_82571, |
1992 | .valid_led_default = e1000_valid_led_default_82571, | 1994 | .valid_led_default = e1000_valid_led_default_82571, |
1993 | .validate = e1000_validate_nvm_checksum_82571, | 1995 | .validate = e1000_validate_nvm_checksum_82571, |