aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/e1000e/e1000.h1
-rw-r--r--drivers/net/e1000e/ethtool.c3
-rw-r--r--drivers/net/e1000e/netdev.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index fdc67fead4e..3d9366ffd16 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -482,6 +482,7 @@ extern const char e1000e_driver_version[];
482 482
483extern void e1000e_check_options(struct e1000_adapter *adapter); 483extern void e1000e_check_options(struct e1000_adapter *adapter);
484extern void e1000e_set_ethtool_ops(struct net_device *netdev); 484extern void e1000e_set_ethtool_ops(struct net_device *netdev);
485extern void e1000e_led_blink_task(struct work_struct *work);
485 486
486extern int e1000e_up(struct e1000_adapter *adapter); 487extern int e1000e_up(struct e1000_adapter *adapter);
487extern void e1000e_down(struct e1000_adapter *adapter); 488extern void e1000e_down(struct e1000_adapter *adapter);
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 3612900b3bf..5c6bc6ac069 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1846,7 +1846,7 @@ static int e1000_set_wol(struct net_device *netdev,
1846/* bit defines for adapter->led_status */ 1846/* bit defines for adapter->led_status */
1847#define E1000_LED_ON 0 1847#define E1000_LED_ON 0
1848 1848
1849static void e1000e_led_blink_task(struct work_struct *work) 1849void e1000e_led_blink_task(struct work_struct *work)
1850{ 1850{
1851 struct e1000_adapter *adapter = container_of(work, 1851 struct e1000_adapter *adapter = container_of(work,
1852 struct e1000_adapter, led_blink_task); 1852 struct e1000_adapter, led_blink_task);
@@ -1878,7 +1878,6 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)
1878 (hw->mac.type == e1000_pch2lan) || 1878 (hw->mac.type == e1000_pch2lan) ||
1879 (hw->mac.type == e1000_82583) || 1879 (hw->mac.type == e1000_82583) ||
1880 (hw->mac.type == e1000_82574)) { 1880 (hw->mac.type == e1000_82574)) {
1881 INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task);
1882 if (!adapter->blink_timer.function) { 1881 if (!adapter->blink_timer.function) {
1883 init_timer(&adapter->blink_timer); 1882 init_timer(&adapter->blink_timer);
1884 adapter->blink_timer.function = 1883 adapter->blink_timer.function =
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 0adcb79e638..f8efbbbfddf 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5903,6 +5903,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
5903 INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround); 5903 INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround);
5904 INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task); 5904 INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task);
5905 INIT_WORK(&adapter->print_hang_task, e1000_print_hw_hang); 5905 INIT_WORK(&adapter->print_hang_task, e1000_print_hw_hang);
5906 INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task);
5906 5907
5907 /* Initialize link parameters. User can change them with ethtool */ 5908 /* Initialize link parameters. User can change them with ethtool */
5908 adapter->hw.mac.autoneg = 1; 5909 adapter->hw.mac.autoneg = 1;