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

Commit 50ad480e authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: toshiba: spider_net: 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 f441df6b

drivers/net/ethernet/toshiba/spider_net_ethtool.c

+14 −10
Original line number Diff line number Diff line
@@ -47,19 +47,23 @@ static struct { 
};



static int

spider_net_ethtool_get_settings(struct net_device *netdev,

			       struct ethtool_cmd *cmd)

spider_net_ethtool_get_link_ksettings(struct net_device *netdev,

				      struct ethtool_link_ksettings *cmd)

{

	struct spider_net_card *card;

	card = netdev_priv(netdev);



	cmd->supported   = (SUPPORTED_1000baseT_Full |

			     SUPPORTED_FIBRE);

	cmd->advertising = (ADVERTISED_1000baseT_Full |

			     ADVERTISED_FIBRE);

	cmd->port = PORT_FIBRE;

	ethtool_cmd_speed_set(cmd, card->phy.speed);

	cmd->duplex = DUPLEX_FULL;

	ethtool_link_ksettings_zero_link_mode(cmd, supported);

	ethtool_link_ksettings_add_link_mode(cmd, supported, 1000baseT_Full);

	ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);



	ethtool_link_ksettings_zero_link_mode(cmd, advertising);

	ethtool_link_ksettings_add_link_mode(cmd, advertising, 1000baseT_Full);

	ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);



	cmd->base.port = PORT_FIBRE;

	cmd->base.speed = card->phy.speed;

	cmd->base.duplex = DUPLEX_FULL;



	return 0;

}
@@ -166,7 +170,6 @@ static void spider_net_get_strings(struct net_device *netdev, u32 stringset, 
}



const struct ethtool_ops spider_net_ethtool_ops = {

	.get_settings		= spider_net_ethtool_get_settings,

	.get_drvinfo		= spider_net_ethtool_get_drvinfo,

	.get_wol		= spider_net_ethtool_get_wol,

	.get_msglevel		= spider_net_ethtool_get_msglevel,
@@ -177,5 +180,6 @@ const struct ethtool_ops spider_net_ethtool_ops = { 
	.get_strings		= spider_net_get_strings,

	.get_sset_count		= spider_net_get_sset_count,

	.get_ethtool_stats	= spider_net_get_ethtool_stats,

	.get_link_ksettings	= spider_net_ethtool_get_link_ksettings,

};