xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: neterion: vxge: use new api ethtool_{get|set}_link_ksettings

Browse Source 
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: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philippe Reynes
2017-02-12 17:33:13 +01:00
committed by David S. Miller
parent 51f21442a2
commit 08041ff24a
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
View File

@@ -38,9 +38,9 @@ static const char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
}; };
/** /**
* vxge_ethtool_sset - Sets different link parameters. * vxge_ethtool_set_link_ksettings - Sets different link parameters.
* @dev: device pointer. * @dev: device pointer.
* @info: pointer to the structure with parameters given by ethtool to set * @cmd: pointer to the structure with parameters given by ethtool to set
* link information. * link information.
* *
* The function sets different link parameters provided by the user onto * The function sets different link parameters provided by the user onto
@@ -48,44 +48,51 @@ static const char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
* Return value: * Return value:
* 0 on success. * 0 on success.
*/ */
static int vxge_ethtool_sset(struct net_device *dev, struct ethtool_cmd *info) static int
vxge_ethtool_set_link_ksettings(struct net_device *dev,
const struct ethtool_link_ksettings *cmd)
{ {
/* We currently only support 10Gb/FULL */ /* We currently only support 10Gb/FULL */
if ((info->autoneg == AUTONEG_ENABLE) || if ((cmd->base.autoneg == AUTONEG_ENABLE) ||
(ethtool_cmd_speed(info) != SPEED_10000) || (cmd->base.speed != SPEED_10000) ||
(info->duplex != DUPLEX_FULL)) (cmd->base.duplex != DUPLEX_FULL))
return -EINVAL; return -EINVAL;
return 0; return 0;
} }
/** /**
* vxge_ethtool_gset - Return link specific information. * vxge_ethtool_get_link_ksettings - Return link specific information.
* @dev: device pointer. * @dev: device pointer.
* @info: pointer to the structure with parameters given by ethtool * @cmd: pointer to the structure with parameters given by ethtool
* to return link information. * to return link information.
* *
* Returns link specific information like speed, duplex etc.. to ethtool. * Returns link specific information like speed, duplex etc.. to ethtool.
* Return value : * Return value :
* return 0 on success. * return 0 on success.
*/ */
static int vxge_ethtool_gset(struct net_device *dev, struct ethtool_cmd *info) static int vxge_ethtool_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{ {
info->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE); ethtool_link_ksettings_zero_link_mode(cmd, supported);
info->advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_FIBRE); ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseT_Full);
info->port = PORT_FIBRE; ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);
info->transceiver = XCVR_EXTERNAL; ethtool_link_ksettings_zero_link_mode(cmd, advertising);
ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseT_Full);
ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);
cmd->base.port = PORT_FIBRE;
if (netif_carrier_ok(dev)) { if (netif_carrier_ok(dev)) {
ethtool_cmd_speed_set(info, SPEED_10000); cmd->base.speed = SPEED_10000;
info->duplex = DUPLEX_FULL; cmd->base.duplex = DUPLEX_FULL;
} else { } else {
ethtool_cmd_speed_set(info, SPEED_UNKNOWN); cmd->base.speed = SPEED_UNKNOWN;
info->duplex = DUPLEX_UNKNOWN; cmd->base.duplex = DUPLEX_UNKNOWN;
} }
info->autoneg = AUTONEG_DISABLE; cmd->base.autoneg = AUTONEG_DISABLE;
return 0; return 0;
} }
@@ -1126,8 +1133,6 @@ static int vxge_fw_flash(struct net_device *dev, struct ethtool_flash *parms)
} }
static const struct ethtool_ops vxge_ethtool_ops = { static const struct ethtool_ops vxge_ethtool_ops = {
.get_settings = vxge_ethtool_gset,
.set_settings = vxge_ethtool_sset,
.get_drvinfo = vxge_ethtool_gdrvinfo, .get_drvinfo = vxge_ethtool_gdrvinfo,
.get_regs_len = vxge_ethtool_get_regs_len, .get_regs_len = vxge_ethtool_get_regs_len,
.get_regs = vxge_ethtool_gregs, .get_regs = vxge_ethtool_gregs,
@@ -1139,6 +1144,8 @@ static const struct ethtool_ops vxge_ethtool_ops = {
.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,
.flash_device = vxge_fw_flash, .flash_device = vxge_fw_flash,
.get_link_ksettings = vxge_ethtool_get_link_ksettings,
.set_link_ksettings = vxge_ethtool_set_link_ksettings,
}; };
void vxge_initialize_ethtool_ops(struct net_device *ndev) void vxge_initialize_ethtool_ops(struct net_device *ndev)