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

Commit 2cf8a897 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: qualcomm: qca: use new api ethtool_{get|set}_link_ksettings 



The ethtool api {get|set}_settings is deprecated.
We move this driver to new api {get|set}_link_ksettings.

As I don't have the hardware, I'd be very pleased if
someone may test this patch.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 836dacdd

drivers/net/ethernet/qualcomm/qca_debug.c

+10 −8
Original line number Original line Diff line number Diff line
@@ -188,14 +188,16 @@ qcaspi_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *p) 
}

}





static int

static int

qcaspi_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

qcaspi_get_link_ksettings(struct net_device *dev,

			  struct ethtool_link_ksettings *cmd)

{

{

	cmd->transceiver = XCVR_INTERNAL;

	ethtool_link_ksettings_zero_link_mode(cmd, supported);

	cmd->supported = SUPPORTED_10baseT_Half;

	ethtool_link_ksettings_add_link_mode(cmd, supported, 10baseT_Half);

	ethtool_cmd_speed_set(cmd,  SPEED_10);



	cmd->duplex = DUPLEX_HALF;

	cmd->base.speed = SPEED_10;

	cmd->port = PORT_OTHER;

	cmd->base.duplex = DUPLEX_HALF;

	cmd->autoneg = AUTONEG_DISABLE;

	cmd->base.port = PORT_OTHER;

	cmd->base.autoneg = AUTONEG_DISABLE;





	return 0;

	return 0;

}

}
@@ -295,7 +297,6 @@ qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) 
static const struct ethtool_ops qcaspi_ethtool_ops = {

static const struct ethtool_ops qcaspi_ethtool_ops = {

	.get_drvinfo = qcaspi_get_drvinfo,

	.get_drvinfo = qcaspi_get_drvinfo,

	.get_link = ethtool_op_get_link,

	.get_link = ethtool_op_get_link,

	.get_settings = qcaspi_get_settings,

	.get_ethtool_stats = qcaspi_get_ethtool_stats,

	.get_ethtool_stats = qcaspi_get_ethtool_stats,

	.get_strings = qcaspi_get_strings,

	.get_strings = qcaspi_get_strings,

	.get_sset_count = qcaspi_get_sset_count,

	.get_sset_count = qcaspi_get_sset_count,
@@ -303,6 +304,7 @@ static const struct ethtool_ops qcaspi_ethtool_ops = { 
	.get_regs = qcaspi_get_regs,

	.get_regs = qcaspi_get_regs,

	.get_ringparam = qcaspi_get_ringparam,

	.get_ringparam = qcaspi_get_ringparam,

	.set_ringparam = qcaspi_set_ringparam,

	.set_ringparam = qcaspi_set_ringparam,

	.get_link_ksettings = qcaspi_get_link_ksettings,

};

};





void qcaspi_set_ethtool_ops(struct net_device *dev)

void qcaspi_set_ethtool_ops(struct net_device *dev)