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

Commit 857a3d0f authored by Dimitris Michailidis's avatar Dimitris Michailidis Committed by David S. Miller
Browse files

cxgb4vf: drop phys_id interface and implement the newer set_phys_id 



Signed-off-by: default avatarDimitris Michailidis <dm@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5e06360

drivers/net/cxgb4vf/cxgb4vf_main.c

+12 −3
Original line number Diff line number Diff line
@@ -1352,11 +1352,20 @@ static int cxgb4vf_set_rx_csum(struct net_device *dev, u32 csum) 
/*

 * Identify the port by blinking the port's LED.

 */

static int cxgb4vf_phys_id(struct net_device *dev, u32 id)

static int cxgb4vf_phys_id(struct net_device *dev,

			   enum ethtool_phys_id_state state)

{

	unsigned int val;

	struct port_info *pi = netdev_priv(dev);



	return t4vf_identify_port(pi->adapter, pi->viid, 5);

	if (state == ETHTOOL_ID_ACTIVE)

		val = 0xffff;

	else if (state == ETHTOOL_ID_INACTIVE)

		val = 0;

	else

		return -EINVAL;



	return t4vf_identify_port(pi->adapter, pi->viid, val);

}



/*
@@ -1588,7 +1597,7 @@ static struct ethtool_ops cxgb4vf_ethtool_ops = { 
	.set_sg			= ethtool_op_set_sg,

	.get_link		= ethtool_op_get_link,

	.get_strings		= cxgb4vf_get_strings,

	.phys_id		= cxgb4vf_phys_id,

	.set_phys_id		= cxgb4vf_phys_id,

	.get_sset_count		= cxgb4vf_get_sset_count,

	.get_ethtool_stats	= cxgb4vf_get_ethtool_stats,

	.get_regs_len		= cxgb4vf_get_regs_len,