diff options
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/80003es2lan.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/82571.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/e1000.h | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/hw.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/nvm.c | 4 |
6 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c index 6e58e94ff46b..bac9dda31b6c 100644 --- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c +++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c | |||
@@ -1457,6 +1457,7 @@ static const struct e1000_nvm_operations es2_nvm_ops = { | |||
1457 | .acquire = e1000_acquire_nvm_80003es2lan, | 1457 | .acquire = e1000_acquire_nvm_80003es2lan, |
1458 | .read = e1000e_read_nvm_eerd, | 1458 | .read = e1000e_read_nvm_eerd, |
1459 | .release = e1000_release_nvm_80003es2lan, | 1459 | .release = e1000_release_nvm_80003es2lan, |
1460 | .reload = e1000e_reload_nvm_generic, | ||
1460 | .update = e1000e_update_nvm_checksum_generic, | 1461 | .update = e1000e_update_nvm_checksum_generic, |
1461 | .valid_led_default = e1000e_valid_led_default, | 1462 | .valid_led_default = e1000e_valid_led_default, |
1462 | .validate = e1000e_validate_nvm_checksum_generic, | 1463 | .validate = e1000e_validate_nvm_checksum_generic, |
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c index 7f44ab76a200..086dad709179 100644 --- a/drivers/net/ethernet/intel/e1000e/82571.c +++ b/drivers/net/ethernet/intel/e1000e/82571.c | |||
@@ -1989,6 +1989,7 @@ static const struct e1000_nvm_operations e82571_nvm_ops = { | |||
1989 | .acquire = e1000_acquire_nvm_82571, | 1989 | .acquire = e1000_acquire_nvm_82571, |
1990 | .read = e1000e_read_nvm_eerd, | 1990 | .read = e1000e_read_nvm_eerd, |
1991 | .release = e1000_release_nvm_82571, | 1991 | .release = e1000_release_nvm_82571, |
1992 | .reload = e1000e_reload_nvm_generic, | ||
1992 | .update = e1000_update_nvm_checksum_82571, | 1993 | .update = e1000_update_nvm_checksum_82571, |
1993 | .valid_led_default = e1000_valid_led_default_82571, | 1994 | .valid_led_default = e1000_valid_led_default_82571, |
1994 | .validate = e1000_validate_nvm_checksum_82571, | 1995 | .validate = e1000_validate_nvm_checksum_82571, |
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h index 9f3a26859d6d..86cdd4793992 100644 --- a/drivers/net/ethernet/intel/e1000e/e1000.h +++ b/drivers/net/ethernet/intel/e1000e/e1000.h | |||
@@ -684,7 +684,7 @@ extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg); | |||
684 | extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data); | 684 | extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data); |
685 | extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw); | 685 | extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw); |
686 | extern void e1000e_release_nvm(struct e1000_hw *hw); | 686 | extern void e1000e_release_nvm(struct e1000_hw *hw); |
687 | extern void e1000e_reload_nvm(struct e1000_hw *hw); | 687 | extern void e1000e_reload_nvm_generic(struct e1000_hw *hw); |
688 | extern s32 e1000_read_mac_addr_generic(struct e1000_hw *hw); | 688 | extern s32 e1000_read_mac_addr_generic(struct e1000_hw *hw); |
689 | 689 | ||
690 | static inline s32 e1000e_read_mac_addr(struct e1000_hw *hw) | 690 | static inline s32 e1000e_read_mac_addr(struct e1000_hw *hw) |
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h index 50e114b68e39..f82ecf536c8b 100644 --- a/drivers/net/ethernet/intel/e1000e/hw.h +++ b/drivers/net/ethernet/intel/e1000e/hw.h | |||
@@ -830,6 +830,7 @@ struct e1000_nvm_operations { | |||
830 | s32 (*acquire)(struct e1000_hw *); | 830 | s32 (*acquire)(struct e1000_hw *); |
831 | s32 (*read)(struct e1000_hw *, u16, u16, u16 *); | 831 | s32 (*read)(struct e1000_hw *, u16, u16, u16 *); |
832 | void (*release)(struct e1000_hw *); | 832 | void (*release)(struct e1000_hw *); |
833 | void (*reload)(struct e1000_hw *); | ||
833 | s32 (*update)(struct e1000_hw *); | 834 | s32 (*update)(struct e1000_hw *); |
834 | s32 (*valid_led_default)(struct e1000_hw *, u16 *); | 835 | s32 (*valid_led_default)(struct e1000_hw *, u16 *); |
835 | s32 (*validate)(struct e1000_hw *); | 836 | s32 (*validate)(struct e1000_hw *); |
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index df91c426a098..8e9af624d54a 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c | |||
@@ -2609,7 +2609,7 @@ release: | |||
2609 | * until after the next adapter reset. | 2609 | * until after the next adapter reset. |
2610 | */ | 2610 | */ |
2611 | if (!ret_val) { | 2611 | if (!ret_val) { |
2612 | e1000e_reload_nvm(hw); | 2612 | nvm->ops.reload(hw); |
2613 | usleep_range(10000, 20000); | 2613 | usleep_range(10000, 20000); |
2614 | } | 2614 | } |
2615 | 2615 | ||
@@ -4043,6 +4043,7 @@ static const struct e1000_nvm_operations ich8_nvm_ops = { | |||
4043 | .acquire = e1000_acquire_nvm_ich8lan, | 4043 | .acquire = e1000_acquire_nvm_ich8lan, |
4044 | .read = e1000_read_nvm_ich8lan, | 4044 | .read = e1000_read_nvm_ich8lan, |
4045 | .release = e1000_release_nvm_ich8lan, | 4045 | .release = e1000_release_nvm_ich8lan, |
4046 | .reload = e1000e_reload_nvm_generic, | ||
4046 | .update = e1000_update_nvm_checksum_ich8lan, | 4047 | .update = e1000_update_nvm_checksum_ich8lan, |
4047 | .valid_led_default = e1000_valid_led_default_ich8lan, | 4048 | .valid_led_default = e1000_valid_led_default_ich8lan, |
4048 | .validate = e1000_validate_nvm_checksum_ich8lan, | 4049 | .validate = e1000_validate_nvm_checksum_ich8lan, |
diff --git a/drivers/net/ethernet/intel/e1000e/nvm.c b/drivers/net/ethernet/intel/e1000e/nvm.c index 24b7930b7500..a969f1af1b4e 100644 --- a/drivers/net/ethernet/intel/e1000e/nvm.c +++ b/drivers/net/ethernet/intel/e1000e/nvm.c | |||
@@ -625,13 +625,13 @@ s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw) | |||
625 | } | 625 | } |
626 | 626 | ||
627 | /** | 627 | /** |
628 | * e1000e_reload_nvm - Reloads EEPROM | 628 | * e1000e_reload_nvm_generic - Reloads EEPROM |
629 | * @hw: pointer to the HW structure | 629 | * @hw: pointer to the HW structure |
630 | * | 630 | * |
631 | * Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the | 631 | * Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the |
632 | * extended control register. | 632 | * extended control register. |
633 | **/ | 633 | **/ |
634 | void e1000e_reload_nvm(struct e1000_hw *hw) | 634 | void e1000e_reload_nvm_generic(struct e1000_hw *hw) |
635 | { | 635 | { |
636 | u32 ctrl_ext; | 636 | u32 ctrl_ext; |
637 | 637 | ||