mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
e1000: convert to set_phys_id
Based on the original patch from Stephen Hemminger. Convert to new LED control infrastucture and remove no longer necessary bits. CC: Stephen Hemminger <shemminger@vyatta.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
a70b86ae20
commit
6435909199
2 changed files with 17 additions and 38 deletions
|
@ -238,9 +238,6 @@ struct e1000_adapter {
|
|||
struct work_struct reset_task;
|
||||
u8 fc_autoneg;
|
||||
|
||||
struct timer_list blink_timer;
|
||||
unsigned long led_status;
|
||||
|
||||
/* TX */
|
||||
struct e1000_tx_ring *tx_ring; /* One per active queue */
|
||||
unsigned int restart_queue;
|
||||
|
|
|
@ -1755,46 +1755,28 @@ static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* toggle LED 4 times per second = 2 "blinks" per second */
|
||||
#define E1000_ID_INTERVAL (HZ/4)
|
||||
|
||||
/* bit defines for adapter->led_status */
|
||||
#define E1000_LED_ON 0
|
||||
|
||||
static void e1000_led_blink_callback(unsigned long data)
|
||||
{
|
||||
struct e1000_adapter *adapter = (struct e1000_adapter *) data;
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
|
||||
if (test_and_change_bit(E1000_LED_ON, &adapter->led_status))
|
||||
e1000_led_off(hw);
|
||||
else
|
||||
e1000_led_on(hw);
|
||||
|
||||
mod_timer(&adapter->blink_timer, jiffies + E1000_ID_INTERVAL);
|
||||
}
|
||||
|
||||
static int e1000_phys_id(struct net_device *netdev, u32 data)
|
||||
static int e1000_set_phys_id(struct net_device *netdev,
|
||||
enum ethtool_phys_id_state state)
|
||||
{
|
||||
struct e1000_adapter *adapter = netdev_priv(netdev);
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
|
||||
if (!data)
|
||||
data = INT_MAX;
|
||||
switch (state) {
|
||||
case ETHTOOL_ID_ACTIVE:
|
||||
e1000_setup_led(hw);
|
||||
return 2;
|
||||
|
||||
if (!adapter->blink_timer.function) {
|
||||
init_timer(&adapter->blink_timer);
|
||||
adapter->blink_timer.function = e1000_led_blink_callback;
|
||||
adapter->blink_timer.data = (unsigned long)adapter;
|
||||
case ETHTOOL_ID_ON:
|
||||
e1000_led_on(hw);
|
||||
break;
|
||||
|
||||
case ETHTOOL_ID_OFF:
|
||||
e1000_led_off(hw);
|
||||
break;
|
||||
|
||||
case ETHTOOL_ID_INACTIVE:
|
||||
e1000_cleanup_led(hw);
|
||||
}
|
||||
e1000_setup_led(hw);
|
||||
mod_timer(&adapter->blink_timer, jiffies);
|
||||
msleep_interruptible(data * 1000);
|
||||
del_timer_sync(&adapter->blink_timer);
|
||||
|
||||
e1000_led_off(hw);
|
||||
clear_bit(E1000_LED_ON, &adapter->led_status);
|
||||
e1000_cleanup_led(hw);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1931,7 +1913,7 @@ static const struct ethtool_ops e1000_ethtool_ops = {
|
|||
.set_tso = e1000_set_tso,
|
||||
.self_test = e1000_diag_test,
|
||||
.get_strings = e1000_get_strings,
|
||||
.phys_id = e1000_phys_id,
|
||||
.set_phys_id = e1000_set_phys_id,
|
||||
.get_ethtool_stats = e1000_get_ethtool_stats,
|
||||
.get_sset_count = e1000_get_sset_count,
|
||||
.get_coalesce = e1000_get_coalesce,
|
||||
|
|
Loading…
Reference in a new issue