AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-16 20:56:42 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: tehuti: 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-03-26 22:03:13 +02:00 committed by David S. Miller
parent bb37056807
commit 86573f6152
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/ethernet/tehuti/tehuti.c
View File

@ -2124,33 +2124,26 @@ static const char
}; };
/* /*
* bdx_get_settings - get device-specific settings * bdx_get_link_ksettings - get device-specific settings
* @netdev * @netdev
* @ecmd * @ecmd
*/ */
static int bdx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) static int bdx_get_link_ksettings(struct net_device *netdev,
struct ethtool_link_ksettings *ecmd)
{ {
u32 rdintcm; ethtool_link_ksettings_zero_link_mode(ecmd, supported);
u32 tdintcm; ethtool_link_ksettings_add_link_mode(ecmd, supported,
struct bdx_priv *priv = netdev_priv(netdev); 10000baseT_Full);
ethtool_link_ksettings_add_link_mode(ecmd, supported, FIBRE);
ethtool_link_ksettings_zero_link_mode(ecmd, advertising);
ethtool_link_ksettings_add_link_mode(ecmd, advertising,
10000baseT_Full);
ethtool_link_ksettings_add_link_mode(ecmd, advertising, FIBRE);
rdintcm = priv->rdintcm; ecmd->base.speed = SPEED_10000;
tdintcm = priv->tdintcm; ecmd->base.duplex = DUPLEX_FULL;
ecmd->base.port = PORT_FIBRE;
ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE); ecmd->base.autoneg = AUTONEG_DISABLE;
ecmd->advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_FIBRE);
ethtool_cmd_speed_set(ecmd, SPEED_10000);
ecmd->duplex = DUPLEX_FULL;
ecmd->port = PORT_FIBRE;
ecmd->transceiver = XCVR_EXTERNAL; /* what does it mean? */
ecmd->autoneg = AUTONEG_DISABLE;
/* PCK_TH measures in multiples of FIFO bytes
We translate to packets */
ecmd->maxtxpkt =
((GET_PCK_TH(tdintcm) * PCK_TH_MULT) / BDX_TXF_DESC_SZ);
ecmd->maxrxpkt =
((GET_PCK_TH(rdintcm) * PCK_TH_MULT) / sizeof(struct rxf_desc));
return 0; return 0;
} }
@ -2384,7 +2377,6 @@ static void bdx_get_ethtool_stats(struct net_device *netdev,
static void bdx_set_ethtool_ops(struct net_device *netdev) static void bdx_set_ethtool_ops(struct net_device *netdev)
{ {
static const struct ethtool_ops bdx_ethtool_ops = { static const struct ethtool_ops bdx_ethtool_ops = {
.get_settings = bdx_get_settings,
.get_drvinfo = bdx_get_drvinfo, .get_drvinfo = bdx_get_drvinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_coalesce = bdx_get_coalesce, .get_coalesce = bdx_get_coalesce,
@ -2394,6 +2386,7 @@ static void bdx_set_ethtool_ops(struct net_device *netdev)
.get_strings = bdx_get_strings, .get_strings = bdx_get_strings,
.get_sset_count = bdx_get_sset_count, .get_sset_count = bdx_get_sset_count,
.get_ethtool_stats = bdx_get_ethtool_stats, .get_ethtool_stats = bdx_get_ethtool_stats,
.get_link_ksettings = bdx_get_link_ksettings,
}; };
netdev->ethtool_ops = &bdx_ethtool_ops; netdev->ethtool_ops = &bdx_ethtool_ops;