aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/lib.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2011-04-15 20:34:40 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-04-27 05:05:53 -0400
commitdbf80dcbd8ca0c50f343401fedd2d6200cb8097e (patch)
treee6804f597018b03055daca6087f03eaaa6f32a45 /drivers/net/e1000e/lib.c
parent2bd93d7af1581d40e3c4b25242472661cb7c637a (diff)
e1000e: implement ethtool set_phys_id
Based on a patch from Stephen Hemminger <shemminger@vyatta.com>. The new ethtool set_phys_id takes over controlling the LED for identifying boards. This fixes the lockout during that period. For this device lots of extra infrastructure can also be removed by using set_phys_id. v2: - return blink frequency for parts that do not support blink in h/w - add blink_led function pointers for devices that do support blink in h/w to cleanup the test for this functionality Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Cc: Stephen Hemminger <shemminger@vyatta.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/e1000e/lib.c')
-rw-r--r--drivers/net/e1000e/lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 30ef8fa4968c..6432ddab40ce 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1530,12 +1530,12 @@ s32 e1000e_cleanup_led_generic(struct e1000_hw *hw)
1530} 1530}
1531 1531
1532/** 1532/**
1533 * e1000e_blink_led - Blink LED 1533 * e1000e_blink_led_generic - Blink LED
1534 * @hw: pointer to the HW structure 1534 * @hw: pointer to the HW structure
1535 * 1535 *
1536 * Blink the LEDs which are set to be on. 1536 * Blink the LEDs which are set to be on.
1537 **/ 1537 **/
1538s32 e1000e_blink_led(struct e1000_hw *hw) 1538s32 e1000e_blink_led_generic(struct e1000_hw *hw)
1539{ 1539{
1540 u32 ledctl_blink = 0; 1540 u32 ledctl_blink = 0;
1541 u32 i; 1541 u32 i;