Commit 7bc93714 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

niu: convert to new ethtool set_phys_id 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9871acf6

drivers/net/niu.c

+16 −13
Original line number Diff line number Diff line
@@ -7888,28 +7888,31 @@ static void niu_force_led(struct niu *np, int on) 
	nw64_mac(reg, val);

}



static int niu_phys_id(struct net_device *dev, u32 data)

static int niu_set_phys_id(struct net_device *dev,

			   enum ethtool_phys_id_state state)



{

	struct niu *np = netdev_priv(dev);

	u64 orig_led_state;

	int i;



	if (!netif_running(dev))

		return -EAGAIN;



	if (data == 0)

		data = 2;



	orig_led_state = niu_led_state_save(np);

	for (i = 0; i < (data * 2); i++) {

		int on = ((i % 2) == 0);

	switch (state) {

	case ETHTOOL_ID_ACTIVE:

		np->orig_led_state = niu_led_state_save(np);

		return -EINVAL;



		niu_force_led(np, on);

	case ETHTOOL_ID_ON:

		niu_force_led(np, 1);

		break;



		if (msleep_interruptible(500))

	case ETHTOOL_ID_OFF:

		niu_force_led(np, 0);

		break;



	case ETHTOOL_ID_INACTIVE:

		niu_led_state_restore(np, np->orig_led_state);

	}

	niu_led_state_restore(np, orig_led_state);



	return 0;

}
@@ -7932,7 +7935,7 @@ static const struct ethtool_ops niu_ethtool_ops = { 
	.get_strings		= niu_get_strings,

	.get_sset_count		= niu_get_sset_count,

	.get_ethtool_stats	= niu_get_ethtool_stats,

	.phys_id		= niu_phys_id,

	.set_phys_id		= niu_set_phys_id,

	.get_rxnfc		= niu_get_nfc,

	.set_rxnfc		= niu_set_nfc,

	.set_flags		= niu_set_flags,

drivers/net/niu.h

+1 −0
Original line number Diff line number Diff line
@@ -3279,6 +3279,7 @@ struct niu { 
	unsigned long			xpcs_off;



	struct timer_list		timer;

	u64				orig_led_state;

	const struct niu_phy_ops	*phy_ops;

	int				phy_addr;