diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_82599.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_82599.c | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index b3f4e96a018c..9e824b450416 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c | |||
@@ -68,8 +68,6 @@ s32 ixgbe_clear_vmdq_82599(struct ixgbe_hw *hw, u32 rar, u32 vmdq); | |||
68 | s32 ixgbe_set_vfta_82599(struct ixgbe_hw *hw, u32 vlan, | 68 | s32 ixgbe_set_vfta_82599(struct ixgbe_hw *hw, u32 vlan, |
69 | u32 vind, bool vlan_on); | 69 | u32 vind, bool vlan_on); |
70 | s32 ixgbe_clear_vfta_82599(struct ixgbe_hw *hw); | 70 | s32 ixgbe_clear_vfta_82599(struct ixgbe_hw *hw); |
71 | s32 ixgbe_blink_led_stop_82599(struct ixgbe_hw *hw, u32 index); | ||
72 | s32 ixgbe_blink_led_start_82599(struct ixgbe_hw *hw, u32 index); | ||
73 | s32 ixgbe_init_uta_tables_82599(struct ixgbe_hw *hw); | 71 | s32 ixgbe_init_uta_tables_82599(struct ixgbe_hw *hw); |
74 | s32 ixgbe_read_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 *val); | 72 | s32 ixgbe_read_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 *val); |
75 | s32 ixgbe_write_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 val); | 73 | s32 ixgbe_write_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 val); |
@@ -1039,40 +1037,6 @@ s32 ixgbe_clear_vfta_82599(struct ixgbe_hw *hw) | |||
1039 | } | 1037 | } |
1040 | 1038 | ||
1041 | /** | 1039 | /** |
1042 | * ixgbe_blink_led_start_82599 - Blink LED based on index. | ||
1043 | * @hw: pointer to hardware structure | ||
1044 | * @index: led number to blink | ||
1045 | **/ | ||
1046 | s32 ixgbe_blink_led_start_82599(struct ixgbe_hw *hw, u32 index) | ||
1047 | { | ||
1048 | u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL); | ||
1049 | |||
1050 | led_reg &= ~IXGBE_LED_MODE_MASK(index); | ||
1051 | led_reg |= IXGBE_LED_BLINK(index); | ||
1052 | IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg); | ||
1053 | IXGBE_WRITE_FLUSH(hw); | ||
1054 | |||
1055 | return 0; | ||
1056 | } | ||
1057 | |||
1058 | /** | ||
1059 | * ixgbe_blink_led_stop_82599 - Stop blinking LED based on index. | ||
1060 | * @hw: pointer to hardware structure | ||
1061 | * @index: led number to stop blinking | ||
1062 | **/ | ||
1063 | s32 ixgbe_blink_led_stop_82599(struct ixgbe_hw *hw, u32 index) | ||
1064 | { | ||
1065 | u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL); | ||
1066 | |||
1067 | led_reg &= ~IXGBE_LED_MODE_MASK(index); | ||
1068 | led_reg &= ~IXGBE_LED_BLINK(index); | ||
1069 | IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg); | ||
1070 | IXGBE_WRITE_FLUSH(hw); | ||
1071 | |||
1072 | return 0; | ||
1073 | } | ||
1074 | |||
1075 | /** | ||
1076 | * ixgbe_init_uta_tables_82599 - Initialize the Unicast Table Array | 1040 | * ixgbe_init_uta_tables_82599 - Initialize the Unicast Table Array |
1077 | * @hw: pointer to hardware structure | 1041 | * @hw: pointer to hardware structure |
1078 | **/ | 1042 | **/ |
@@ -1353,8 +1317,8 @@ static struct ixgbe_mac_operations mac_ops_82599 = { | |||
1353 | .get_link_capabilities = &ixgbe_get_link_capabilities_82599, | 1317 | .get_link_capabilities = &ixgbe_get_link_capabilities_82599, |
1354 | .led_on = &ixgbe_led_on_generic, | 1318 | .led_on = &ixgbe_led_on_generic, |
1355 | .led_off = &ixgbe_led_off_generic, | 1319 | .led_off = &ixgbe_led_off_generic, |
1356 | .blink_led_start = &ixgbe_blink_led_start_82599, | 1320 | .blink_led_start = &ixgbe_blink_led_start_generic, |
1357 | .blink_led_stop = &ixgbe_blink_led_stop_82599, | 1321 | .blink_led_stop = &ixgbe_blink_led_stop_generic, |
1358 | .set_rar = &ixgbe_set_rar_generic, | 1322 | .set_rar = &ixgbe_set_rar_generic, |
1359 | .clear_rar = &ixgbe_clear_rar_generic, | 1323 | .clear_rar = &ixgbe_clear_rar_generic, |
1360 | .set_vmdq = &ixgbe_set_vmdq_82599, | 1324 | .set_vmdq = &ixgbe_set_vmdq_82599, |