Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64359091 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

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: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a70b86ae

drivers/net/e1000/e1000.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/e1000/e1000_ethtool.c

+16 −34
Original line number Diff line number Diff line
@@ -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;



	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;

	}

	switch (state) {

	case ETHTOOL_ID_ACTIVE:

		e1000_setup_led(hw);

	mod_timer(&adapter->blink_timer, jiffies);

	msleep_interruptible(data * 1000);

	del_timer_sync(&adapter->blink_timer);

		return 2;



	case ETHTOOL_ID_ON:

		e1000_led_on(hw);

		break;



	case ETHTOOL_ID_OFF:

		e1000_led_off(hw);

	clear_bit(E1000_LED_ON, &adapter->led_status);

		break;



	case ETHTOOL_ID_INACTIVE:

		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,