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

Commit 6d8a7e6f authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

vxge: convert to set_phys_id 



Also fix up incorrect docbook comment

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

drivers/net/vxge/vxge-ethtool.c

+16 −9
Original line number Original line Diff line number Diff line
@@ -134,22 +134,29 @@ static void vxge_ethtool_gregs(struct net_device *dev, 
/**

/**

 * vxge_ethtool_idnic - To physically identify the nic on the system.

 * vxge_ethtool_idnic - To physically identify the nic on the system.

 * @dev : device pointer.

 * @dev : device pointer.

 * @id : pointer to the structure with identification parameters given by

 * @state : requested LED state

 * ethtool.

 *

 *

 * Used to physically identify the NIC on the system.

 * Used to physically identify the NIC on the system.

 * The Link LED will blink for a time specified by the user.

 * Return value:

 * 0 on success

 * 0 on success

 */

 */

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

static int vxge_ethtool_idnic(struct net_device *dev,

			      enum ethtool_phys_id_state state)

{

{

	struct vxgedev *vdev = netdev_priv(dev);

	struct vxgedev *vdev = netdev_priv(dev);

	struct __vxge_hw_device *hldev = vdev->devh;

	struct __vxge_hw_device *hldev = vdev->devh;





	switch (state) {

	case ETHTOOL_ID_ACTIVE:

		vxge_hw_device_flick_link_led(hldev, VXGE_FLICKER_ON);

		vxge_hw_device_flick_link_led(hldev, VXGE_FLICKER_ON);

	msleep_interruptible(data ? (data * HZ) : VXGE_MAX_FLICKER_TIME);

		break;



	case ETHTOOL_ID_INACTIVE:

		vxge_hw_device_flick_link_led(hldev, VXGE_FLICKER_OFF);

		vxge_hw_device_flick_link_led(hldev, VXGE_FLICKER_OFF);

		break;



	default:

		return -EINVAL;

	}





	return 0;

	return 0;

}

}
@@ -1183,7 +1190,7 @@ static const struct ethtool_ops vxge_ethtool_ops = { 
	.get_tso		= ethtool_op_get_tso,

	.get_tso		= ethtool_op_get_tso,

	.set_tso		= vxge_ethtool_op_set_tso,

	.set_tso		= vxge_ethtool_op_set_tso,

	.get_strings		= vxge_ethtool_get_strings,

	.get_strings		= vxge_ethtool_get_strings,

	.phys_id		= vxge_ethtool_idnic,

	.set_phys_id		= vxge_ethtool_idnic,

	.get_sset_count		= vxge_ethtool_get_sset_count,

	.get_sset_count		= vxge_ethtool_get_sset_count,

	.get_ethtool_stats	= vxge_get_ethtool_stats,

	.get_ethtool_stats	= vxge_get_ethtool_stats,

	.set_flags		= vxge_set_flags,

	.set_flags		= vxge_set_flags,