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

Commit 031e5144 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: fjes: 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 92f4a13e

drivers/net/fjes/fjes_ethtool.c

+9 −10
Original line number Diff line number Diff line
@@ -175,16 +175,15 @@ static void fjes_get_drvinfo(struct net_device *netdev, 
		 "platform:%s", plat_dev->name);

}



static int fjes_get_settings(struct net_device *netdev,

			     struct ethtool_cmd *ecmd)

static int fjes_get_link_ksettings(struct net_device *netdev,

				   struct ethtool_link_ksettings *ecmd)

{

	ecmd->supported = 0;

	ecmd->advertising = 0;

	ecmd->duplex = DUPLEX_FULL;

	ecmd->autoneg = AUTONEG_DISABLE;

	ecmd->transceiver = XCVR_DUMMY1;

	ecmd->port = PORT_NONE;

	ethtool_cmd_speed_set(ecmd, 20000);	/* 20Gb/s */

	ethtool_link_ksettings_zero_link_mode(ecmd, supported);

	ethtool_link_ksettings_zero_link_mode(ecmd, advertising);

	ecmd->base.duplex = DUPLEX_FULL;

	ecmd->base.autoneg = AUTONEG_DISABLE;

	ecmd->base.port = PORT_NONE;

	ecmd->base.speed = 20000;	/* 20Gb/s */



	return 0;

}
@@ -296,7 +295,6 @@ static int fjes_get_dump_data(struct net_device *netdev, 
}



static const struct ethtool_ops fjes_ethtool_ops = {

		.get_settings		= fjes_get_settings,

		.get_drvinfo		= fjes_get_drvinfo,

		.get_ethtool_stats = fjes_get_ethtool_stats,

		.get_strings      = fjes_get_strings,
@@ -306,6 +304,7 @@ static const struct ethtool_ops fjes_ethtool_ops = { 
		.set_dump		= fjes_set_dump,

		.get_dump_flag		= fjes_get_dump_flag,

		.get_dump_data		= fjes_get_dump_data,

		.get_link_ksettings	= fjes_get_link_ksettings,

};



void fjes_set_ethtool_ops(struct net_device *netdev)