--- v3
+++ v4
@@ -1,503 +1,101 @@
From: David Decotigny <decot@googlers.com>
+
+replaced by __ethtool_get_ksettings.
Signed-off-by: David Decotigny <decot@googlers.com>
---
- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 323 ++++++++++++------------
- drivers/net/ethernet/mellanox/mlx4/en_main.c | 1 +
- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 +
- 3 files changed, 157 insertions(+), 168 deletions(-)
+ include/linux/ethtool.h | 4 ----
+ net/core/ethtool.c | 45 ++++++++++++++-------------------------------
+ 2 files changed, 14 insertions(+), 35 deletions(-)
-diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
-index dd84cab..0ccdc84 100644
---- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
-+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
-@@ -501,34 +501,30 @@ static u32 mlx4_en_autoneg_get(struct net_device *dev)
- return autoneg;
+diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
+index 6077cbb..05d4f0e 100644
+--- a/include/linux/ethtool.h
++++ b/include/linux/ethtool.h
+@@ -148,10 +148,6 @@ struct ethtool_ksettings {
+ extern int __ethtool_get_ksettings(struct net_device *dev,
+ struct ethtool_ksettings *ksettings);
+
+-/* DEPRECATED, use __ethtool_get_ksettings */
+-extern int __ethtool_get_settings(struct net_device *dev,
+- struct ethtool_cmd *cmd);
+-
+ /**
+ * struct ethtool_ops - optional netdev operations
+ * @get_settings: DEPRECATED, use %get_ksettings/%set_ksettings
+diff --git a/net/core/ethtool.c b/net/core/ethtool.c
+index 4865031..84dca87 100644
+--- a/net/core/ethtool.c
++++ b/net/core/ethtool.c
+@@ -495,7 +495,12 @@ int __ethtool_get_ksettings(struct net_device *dev,
+ * legacy %ethtool_cmd API, unless it's not supported either.
+ * TODO: remove when ethtool_ops::get_settings disappears internally
+ */
+- err = __ethtool_get_settings(dev, &cmd);
++ if (!dev->ethtool_ops->get_settings)
++ return -EOPNOTSUPP;
++
++ memset(&cmd, 0, sizeof(cmd));
++ cmd.cmd = ETHTOOL_GSET;
++ err = dev->ethtool_ops->get_settings(dev, &cmd);
+ if (err < 0)
+ return err;
+
+@@ -652,30 +657,6 @@ static int ethtool_set_ksettings(struct net_device *dev, void __user *useraddr)
+ return dev->ethtool_ops->set_ksettings(dev, &ksettings);
}
--static u32 ptys_get_supported_port(struct mlx4_ptys_reg *ptys_reg)
-+static void ptys2ethtool_update_supported_port(ethtool_link_mode_mask_t *mask,
-+ struct mlx4_ptys_reg *ptys_reg)
+-/* Internal kernel helper to query a device ethtool_cmd settings.
+- *
+- * Note about transition to ethtool_settings API: We do not need (or
+- * want) this function to support "dev" instances that implement the
+- * ethtool_settings API as we will update the drivers calling this
+- * function to call __ethtool_get_ksettings instead, before the first
+- * drivers implement ethtool_ops::get_ksettings.
+- *
+- * TODO 1: at least make this function static when no driver is using it
+- * TODO 2: remove when ethtool_ops::get_settings disappears internally
+- */
+-int __ethtool_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+-{
+- ASSERT_RTNL();
+-
+- if (!dev->ethtool_ops->get_settings)
+- return -EOPNOTSUPP;
+-
+- memset(cmd, 0, sizeof(struct ethtool_cmd));
+- cmd->cmd = ETHTOOL_GSET;
+- return dev->ethtool_ops->get_settings(dev, cmd);
+-}
+-EXPORT_SYMBOL(__ethtool_get_settings);
+-
+ static void
+ warn_incomplete_ethtool_legacy_settings_conversion(const char *details)
{
- u32 eth_proto = be32_to_cpu(ptys_reg->eth_proto_cap);
-
- if (eth_proto & (MLX4_PROT_MASK(MLX4_10GBASE_T)
- | MLX4_PROT_MASK(MLX4_1000BASE_T)
- | MLX4_PROT_MASK(MLX4_100BASE_TX))) {
-- return SUPPORTED_TP;
-- }
+@@ -717,16 +698,18 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr)
+ /* send a sensible cmd tag back to user */
+ cmd.cmd = ETHTOOL_GSET;
+ } else {
+- int err;
+- /* TODO: return -EOPNOTSUPP when
+- * ethtool_ops::get_settings disappears internally
+- */
-
-- if (eth_proto & (MLX4_PROT_MASK(MLX4_10GBASE_CR)
-+ ethtool_add_link_modes(mask, ETHTOOL_LINK_MODE_TP_BIT);
-+ } else if (eth_proto & (MLX4_PROT_MASK(MLX4_10GBASE_CR)
- | MLX4_PROT_MASK(MLX4_10GBASE_SR)
- | MLX4_PROT_MASK(MLX4_56GBASE_SR4)
- | MLX4_PROT_MASK(MLX4_40GBASE_CR4)
- | MLX4_PROT_MASK(MLX4_40GBASE_SR4)
- | MLX4_PROT_MASK(MLX4_1000BASE_CX_SGMII))) {
-- return SUPPORTED_FIBRE;
-- }
--
-- if (eth_proto & (MLX4_PROT_MASK(MLX4_56GBASE_KR4)
-+ ethtool_add_link_modes(mask, ETHTOOL_LINK_MODE_FIBRE_BIT);
-+ } else if (eth_proto & (MLX4_PROT_MASK(MLX4_56GBASE_KR4)
- | MLX4_PROT_MASK(MLX4_40GBASE_KR4)
- | MLX4_PROT_MASK(MLX4_20GBASE_KR2)
- | MLX4_PROT_MASK(MLX4_10GBASE_KR)
- | MLX4_PROT_MASK(MLX4_10GBASE_KX4)
- | MLX4_PROT_MASK(MLX4_1000BASE_KX))) {
-- return SUPPORTED_Backplane;
-+ ethtool_add_link_modes(mask, ETHTOOL_LINK_MODE_Backplane_BIT);
+ /* driver doesn't support %ethtool_ksettings
+ * API. revert to legacy %ethtool_cmd API, unless it's
+ * not supported either.
+ */
+- err = __ethtool_get_settings(dev, &cmd);
++ int err;
++
++ if (!dev->ethtool_ops->get_settings)
++ return -EOPNOTSUPP;
++
++ memset(&cmd, 0, sizeof(cmd));
++ cmd.cmd = ETHTOOL_GSET;
++ err = dev->ethtool_ops->get_settings(dev, &cmd);
+ if (err < 0)
+ return err;
}
-- return 0;
- }
-
- static u32 ptys_get_active_port(struct mlx4_ptys_reg *ptys_reg)
-@@ -574,122 +570,91 @@ static u32 ptys_get_active_port(struct mlx4_ptys_reg *ptys_reg)
- enum ethtool_report {
- SUPPORTED = 0,
- ADVERTISED = 1,
-- SPEED = 2
- };
-
-+struct ptys2ethtool_config {
-+ ethtool_link_mode_mask_t link_modes[2]; /* SUPPORTED/ADVERTISED */
-+ u32 speed;
-+};
-+
-+#define MLX4_BUILD_PTYS2ETHTOOL_CONFIG(reg_, speed_, ...) \
-+ ({ \
-+ struct ptys2ethtool_config *cfg; \
-+ cfg = &ptys2ethtool_map[reg_]; \
-+ cfg->speed = speed_; \
-+ ethtool_build_link_mode(&cfg->link_modes[SUPPORTED], \
-+ __VA_ARGS__); \
-+ ethtool_build_link_mode(&cfg->link_modes[ADVERTISED], \
-+ __VA_ARGS__); \
-+ })
-+
- /* Translates mlx4 link mode to equivalent ethtool Link modes/speed */
--static u32 ptys2ethtool_map[MLX4_LINK_MODES_SZ][3] = {
-- [MLX4_100BASE_TX] = {
-- SUPPORTED_100baseT_Full,
-- ADVERTISED_100baseT_Full,
-- SPEED_100
-- },
--
-- [MLX4_1000BASE_T] = {
-- SUPPORTED_1000baseT_Full,
-- ADVERTISED_1000baseT_Full,
-- SPEED_1000
-- },
-- [MLX4_1000BASE_CX_SGMII] = {
-- SUPPORTED_1000baseKX_Full,
-- ADVERTISED_1000baseKX_Full,
-- SPEED_1000
-- },
-- [MLX4_1000BASE_KX] = {
-- SUPPORTED_1000baseKX_Full,
-- ADVERTISED_1000baseKX_Full,
-- SPEED_1000
-- },
--
-- [MLX4_10GBASE_T] = {
-- SUPPORTED_10000baseT_Full,
-- ADVERTISED_10000baseT_Full,
-- SPEED_10000
-- },
-- [MLX4_10GBASE_CX4] = {
-- SUPPORTED_10000baseKX4_Full,
-- ADVERTISED_10000baseKX4_Full,
-- SPEED_10000
-- },
-- [MLX4_10GBASE_KX4] = {
-- SUPPORTED_10000baseKX4_Full,
-- ADVERTISED_10000baseKX4_Full,
-- SPEED_10000
-- },
-- [MLX4_10GBASE_KR] = {
-- SUPPORTED_10000baseKR_Full,
-- ADVERTISED_10000baseKR_Full,
-- SPEED_10000
-- },
-- [MLX4_10GBASE_CR] = {
-- SUPPORTED_10000baseKR_Full,
-- ADVERTISED_10000baseKR_Full,
-- SPEED_10000
-- },
-- [MLX4_10GBASE_SR] = {
-- SUPPORTED_10000baseKR_Full,
-- ADVERTISED_10000baseKR_Full,
-- SPEED_10000
-- },
--
-- [MLX4_20GBASE_KR2] = {
-- SUPPORTED_20000baseMLD2_Full | SUPPORTED_20000baseKR2_Full,
-- ADVERTISED_20000baseMLD2_Full | ADVERTISED_20000baseKR2_Full,
-- SPEED_20000
-- },
--
-- [MLX4_40GBASE_CR4] = {
-- SUPPORTED_40000baseCR4_Full,
-- ADVERTISED_40000baseCR4_Full,
-- SPEED_40000
-- },
-- [MLX4_40GBASE_KR4] = {
-- SUPPORTED_40000baseKR4_Full,
-- ADVERTISED_40000baseKR4_Full,
-- SPEED_40000
-- },
-- [MLX4_40GBASE_SR4] = {
-- SUPPORTED_40000baseSR4_Full,
-- ADVERTISED_40000baseSR4_Full,
-- SPEED_40000
-- },
--
-- [MLX4_56GBASE_KR4] = {
-- SUPPORTED_56000baseKR4_Full,
-- ADVERTISED_56000baseKR4_Full,
-- SPEED_56000
-- },
-- [MLX4_56GBASE_CR4] = {
-- SUPPORTED_56000baseCR4_Full,
-- ADVERTISED_56000baseCR4_Full,
-- SPEED_56000
-- },
-- [MLX4_56GBASE_SR4] = {
-- SUPPORTED_56000baseSR4_Full,
-- ADVERTISED_56000baseSR4_Full,
-- SPEED_56000
-- },
-+static struct ptys2ethtool_config ptys2ethtool_map[MLX4_LINK_MODES_SZ];
-+
-+void __init mlx4_en_init_ptys2ethtool_map(void)
-+{
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_100BASE_TX, SPEED_100,
-+ ETHTOOL_LINK_MODE_100baseT_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_1000BASE_T, SPEED_1000,
-+ ETHTOOL_LINK_MODE_1000baseT_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_1000BASE_CX_SGMII, SPEED_1000,
-+ ETHTOOL_LINK_MODE_1000baseKX_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_1000BASE_KX, SPEED_1000,
-+ ETHTOOL_LINK_MODE_1000baseKX_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_10GBASE_T, SPEED_10000,
-+ ETHTOOL_LINK_MODE_10000baseT_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_10GBASE_CX4, SPEED_10000,
-+ ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_10GBASE_KX4, SPEED_10000,
-+ ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_10GBASE_KR, SPEED_10000,
-+ ETHTOOL_LINK_MODE_10000baseKR_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_10GBASE_CR, SPEED_10000,
-+ ETHTOOL_LINK_MODE_10000baseKR_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_10GBASE_SR, SPEED_10000,
-+ ETHTOOL_LINK_MODE_10000baseKR_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_20GBASE_KR2, SPEED_20000,
-+ ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT,
-+ ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_40GBASE_CR4, SPEED_40000,
-+ ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_40GBASE_KR4, SPEED_40000,
-+ ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_40GBASE_SR4, SPEED_40000,
-+ ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_56GBASE_KR4, SPEED_56000,
-+ ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_56GBASE_CR4, SPEED_56000,
-+ ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT);
-+ MLX4_BUILD_PTYS2ETHTOOL_CONFIG(MLX4_56GBASE_SR4, SPEED_56000,
-+ ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT);
- };
-
--static u32 ptys2ethtool_link_modes(u32 eth_proto, enum ethtool_report report)
-+static void ptys2ethtool_update_link_modes(ethtool_link_mode_mask_t *link_modes,
-+ u32 eth_proto,
-+ enum ethtool_report report)
- {
- int i;
-- u32 link_modes = 0;
--
- for (i = 0; i < MLX4_LINK_MODES_SZ; i++) {
- if (eth_proto & MLX4_PROT_MASK(i))
-- link_modes |= ptys2ethtool_map[i][report];
-+ bitmap_or(link_modes->mask,
-+ link_modes->mask,
-+ ptys2ethtool_map[i].link_modes[report].mask,
-+ __ETHTOOL_LINK_MODE_MASK_NBITS);
- }
-- return link_modes;
- }
-
--static u32 ethtool2ptys_link_modes(u32 link_modes, enum ethtool_report report)
-+static u32 ethtool2ptys_link_modes(const ethtool_link_mode_mask_t *link_modes,
-+ enum ethtool_report report)
- {
- int i;
- u32 ptys_modes = 0;
-
- for (i = 0; i < MLX4_LINK_MODES_SZ; i++) {
-- if (ptys2ethtool_map[i][report] & link_modes)
-+ if (bitmap_intersects(
-+ ptys2ethtool_map[i].link_modes[report].mask,
-+ link_modes->mask,
-+ __ETHTOOL_LINK_MODE_MASK_NBITS))
- ptys_modes |= 1 << i;
- }
- return ptys_modes;
-@@ -702,14 +667,14 @@ static u32 speed2ptys_link_modes(u32 speed)
- u32 ptys_modes = 0;
-
- for (i = 0; i < MLX4_LINK_MODES_SZ; i++) {
-- if (ptys2ethtool_map[i][SPEED] == speed)
-+ if (ptys2ethtool_map[i].speed == speed)
- ptys_modes |= 1 << i;
- }
- return ptys_modes;
- }
-
--static int ethtool_get_ptys_settings(struct net_device *dev,
-- struct ethtool_cmd *cmd)
-+static int ethtool_get_ptys_ksettings(struct net_device *dev,
-+ struct ethtool_ksettings *ksettings)
- {
- struct mlx4_en_priv *priv = netdev_priv(dev);
- struct mlx4_ptys_reg ptys_reg;
-@@ -737,79 +702,94 @@ static int ethtool_get_ptys_settings(struct net_device *dev,
- en_dbg(DRV, priv, "ptys_reg.eth_proto_lp_adv %x\n",
- be32_to_cpu(ptys_reg.eth_proto_lp_adv));
-
-- cmd->supported = 0;
-- cmd->advertising = 0;
-+ /* reset supported/advertising masks */
-+ ethtool_build_link_mode(&ksettings->link_modes.supported);
-+ ethtool_build_link_mode(&ksettings->link_modes.advertising);
-
-- cmd->supported |= ptys_get_supported_port(&ptys_reg);
-+ ptys2ethtool_update_supported_port(&ksettings->link_modes.supported,
-+ &ptys_reg);
-
- eth_proto = be32_to_cpu(ptys_reg.eth_proto_cap);
-- cmd->supported |= ptys2ethtool_link_modes(eth_proto, SUPPORTED);
-+ ptys2ethtool_update_link_modes(&ksettings->link_modes.supported,
-+ eth_proto, SUPPORTED);
-
- eth_proto = be32_to_cpu(ptys_reg.eth_proto_admin);
-- cmd->advertising |= ptys2ethtool_link_modes(eth_proto, ADVERTISED);
-+ ptys2ethtool_update_link_modes(&ksettings->link_modes.advertising,
-+ eth_proto, ADVERTISED);
-
-- cmd->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
-- cmd->advertising |= (priv->prof->tx_pause) ? ADVERTISED_Pause : 0;
-+ ethtool_add_link_modes(&ksettings->link_modes.supported,
-+ ETHTOOL_LINK_MODE_Pause_BIT,
-+ ETHTOOL_LINK_MODE_Pause_BIT);
-
-- cmd->advertising |= (priv->prof->tx_pause ^ priv->prof->rx_pause) ?
-- ADVERTISED_Asym_Pause : 0;
-+ if (priv->prof->tx_pause)
-+ ethtool_add_link_modes(&ksettings->link_modes.advertising,
-+ ETHTOOL_LINK_MODE_Pause_BIT);
-+ if (priv->prof->tx_pause ^ priv->prof->rx_pause)
-+ ethtool_add_link_modes(&ksettings->link_modes.advertising,
-+ ETHTOOL_LINK_MODE_Asym_Pause_BIT);
-
-- cmd->port = ptys_get_active_port(&ptys_reg);
-- cmd->transceiver = (SUPPORTED_TP & cmd->supported) ?
-- XCVR_EXTERNAL : XCVR_INTERNAL;
-+ ksettings->parent.port = ptys_get_active_port(&ptys_reg);
-
- if (mlx4_en_autoneg_get(dev)) {
-- cmd->supported |= SUPPORTED_Autoneg;
-- cmd->advertising |= ADVERTISED_Autoneg;
-+ ethtool_add_link_modes(&ksettings->link_modes.supported,
-+ ETHTOOL_LINK_MODE_Autoneg_BIT);
-+ ethtool_add_link_modes(&ksettings->link_modes.advertising,
-+ ETHTOOL_LINK_MODE_Autoneg_BIT);
- }
-
-- cmd->autoneg = (priv->port_state.flags & MLX4_EN_PORT_ANC) ?
-+ ksettings->parent.autoneg
-+ = (priv->port_state.flags & MLX4_EN_PORT_ANC) ?
- AUTONEG_ENABLE : AUTONEG_DISABLE;
-
- eth_proto = be32_to_cpu(ptys_reg.eth_proto_lp_adv);
-- cmd->lp_advertising = ptys2ethtool_link_modes(eth_proto, ADVERTISED);
-
-- cmd->lp_advertising |= (priv->port_state.flags & MLX4_EN_PORT_ANC) ?
-- ADVERTISED_Autoneg : 0;
-+ ethtool_build_link_mode(&ksettings->link_modes.lp_advertising);
-+ ptys2ethtool_update_link_modes(&ksettings->link_modes.lp_advertising,
-+ eth_proto, ADVERTISED);
-+ if (priv->port_state.flags & MLX4_EN_PORT_ANC)
-+ ethtool_add_link_modes(&ksettings->link_modes.lp_advertising,
-+ ETHTOOL_LINK_MODE_Autoneg_BIT);
-
-- cmd->phy_address = 0;
-- cmd->mdio_support = 0;
-- cmd->maxtxpkt = 0;
-- cmd->maxrxpkt = 0;
-- cmd->eth_tp_mdix = ETH_TP_MDI_INVALID;
-- cmd->eth_tp_mdix_ctrl = ETH_TP_MDI_AUTO;
-+ ksettings->parent.phy_address = 0;
-+ ksettings->parent.mdio_support = 0;
-+ ksettings->parent.eth_tp_mdix = ETH_TP_MDI_INVALID;
-+ ksettings->parent.eth_tp_mdix_ctrl = ETH_TP_MDI_AUTO;
-
- return ret;
- }
-
--static void ethtool_get_default_settings(struct net_device *dev,
-- struct ethtool_cmd *cmd)
-+static void ethtool_get_default_ksettings(struct net_device *dev,
-+ struct ethtool_ksettings *ksettings)
- {
- struct mlx4_en_priv *priv = netdev_priv(dev);
- int trans_type;
-
-- cmd->autoneg = AUTONEG_DISABLE;
-- cmd->supported = SUPPORTED_10000baseT_Full;
-- cmd->advertising = ADVERTISED_10000baseT_Full;
-+ ksettings->parent.autoneg = AUTONEG_DISABLE;
-+ ethtool_build_link_mode(&ksettings->link_modes.supported,
-+ ETHTOOL_LINK_MODE_10000baseT_Full_BIT);
-+ ethtool_build_link_mode(&ksettings->link_modes.advertising,
-+ ETHTOOL_LINK_MODE_10000baseT_Full_BIT);
- trans_type = priv->port_state.transceiver;
-
- if (trans_type > 0 && trans_type <= 0xC) {
-- cmd->port = PORT_FIBRE;
-- cmd->transceiver = XCVR_EXTERNAL;
-- cmd->supported |= SUPPORTED_FIBRE;
-- cmd->advertising |= ADVERTISED_FIBRE;
-+ ksettings->parent.port = PORT_FIBRE;
-+ ethtool_add_link_modes(&ksettings->link_modes.supported,
-+ ETHTOOL_LINK_MODE_FIBRE_BIT);
-+ ethtool_add_link_modes(&ksettings->link_modes.advertising,
-+ ETHTOOL_LINK_MODE_FIBRE_BIT);
- } else if (trans_type == 0x80 || trans_type == 0) {
-- cmd->port = PORT_TP;
-- cmd->transceiver = XCVR_INTERNAL;
-- cmd->supported |= SUPPORTED_TP;
-- cmd->advertising |= ADVERTISED_TP;
-+ ksettings->parent.port = PORT_TP;
-+ ethtool_add_link_modes(&ksettings->link_modes.supported,
-+ ETHTOOL_LINK_MODE_TP_BIT);
-+ ethtool_add_link_modes(&ksettings->link_modes.advertising,
-+ ETHTOOL_LINK_MODE_TP_BIT);
- } else {
-- cmd->port = -1;
-- cmd->transceiver = -1;
-+ ksettings->parent.port = -1;
- }
- }
-
--static int mlx4_en_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-+static int mlx4_en_get_ksettings(struct net_device *dev,
-+ struct ethtool_ksettings *ksettings)
- {
- struct mlx4_en_priv *priv = netdev_priv(dev);
- int ret = -EINVAL;
-@@ -822,16 +802,16 @@ static int mlx4_en_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
- priv->port_state.flags & MLX4_EN_PORT_ANE);
-
- if (priv->mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ETH_PROT_CTRL)
-- ret = ethtool_get_ptys_settings(dev, cmd);
-+ ret = ethtool_get_ptys_ksettings(dev, ksettings);
- if (ret) /* ETH PROT CRTL is not supported or PTYS CMD failed */
-- ethtool_get_default_settings(dev, cmd);
-+ ethtool_get_default_ksettings(dev, ksettings);
-
- if (netif_carrier_ok(dev)) {
-- ethtool_cmd_speed_set(cmd, priv->port_state.link_speed);
-- cmd->duplex = DUPLEX_FULL;
-+ ksettings->parent.speed = priv->port_state.link_speed;
-+ ksettings->parent.duplex = DUPLEX_FULL;
- } else {
-- ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
-- cmd->duplex = DUPLEX_UNKNOWN;
-+ ksettings->parent.speed = SPEED_UNKNOWN;
-+ ksettings->parent.duplex = DUPLEX_UNKNOWN;
- }
- return 0;
- }
-@@ -855,21 +835,28 @@ static __be32 speed_set_ptys_admin(struct mlx4_en_priv *priv, u32 speed,
- return proto_admin;
- }
-
--static int mlx4_en_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-+static int mlx4_en_set_ksettings(struct net_device *dev,
-+ const struct ethtool_ksettings *ksettings)
- {
- struct mlx4_en_priv *priv = netdev_priv(dev);
- struct mlx4_ptys_reg ptys_reg;
- __be32 proto_admin;
- int ret;
-
-- u32 ptys_adv = ethtool2ptys_link_modes(cmd->advertising, ADVERTISED);
-- int speed = ethtool_cmd_speed(cmd);
-+ u32 ptys_adv = ethtool2ptys_link_modes(
-+ &ksettings->link_modes.advertising, ADVERTISED);
-+ const int speed = ksettings->parent.speed;
-
-- en_dbg(DRV, priv, "Set Speed=%d adv=0x%x autoneg=%d duplex=%d\n",
-- speed, cmd->advertising, cmd->autoneg, cmd->duplex);
-+ if (en_dbg_enabled(DRV, priv)) {
-+ en_dbg(DRV, priv,
-+ "Set Speed=%d adv={%*pbl} autoneg=%d duplex=%d\n",
-+ speed, __ETHTOOL_LINK_MODE_MASK_NBITS,
-+ ksettings->link_modes.supported.mask,
-+ ksettings->parent.autoneg, ksettings->parent.duplex);
-+ }
-
- if (!(priv->mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ETH_PROT_CTRL) ||
-- (cmd->duplex == DUPLEX_HALF))
-+ (ksettings->parent.duplex == DUPLEX_HALF))
- return -EINVAL;
-
- memset(&ptys_reg, 0, sizeof(ptys_reg));
-@@ -883,7 +870,7 @@ static int mlx4_en_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
- return 0;
- }
-
-- proto_admin = cmd->autoneg == AUTONEG_ENABLE ?
-+ proto_admin = ksettings->parent.autoneg == AUTONEG_ENABLE ?
- cpu_to_be32(ptys_adv) :
- speed_set_ptys_admin(priv, speed,
- ptys_reg.eth_proto_cap);
-@@ -1982,8 +1969,8 @@ static int mlx4_en_set_phys_id(struct net_device *dev,
-
- const struct ethtool_ops mlx4_en_ethtool_ops = {
- .get_drvinfo = mlx4_en_get_drvinfo,
-- .get_settings = mlx4_en_get_settings,
-- .set_settings = mlx4_en_set_settings,
-+ .get_ksettings = mlx4_en_get_ksettings,
-+ .set_ksettings = mlx4_en_set_ksettings,
- .get_link = ethtool_op_get_link,
- .get_strings = mlx4_en_get_strings,
- .get_sset_count = mlx4_en_get_sset_count,
-diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
-index 005f910..98913bb 100644
---- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
-+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
-@@ -389,6 +389,7 @@ static void mlx4_en_verify_params(void)
- static int __init mlx4_en_init(void)
- {
- mlx4_en_verify_params();
-+ mlx4_en_init_ptys2ethtool_map();
-
- return mlx4_register_interface(&mlx4_en_interface);
- }
-diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
-index b04054d..2d8af43 100644
---- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
-+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
-@@ -607,6 +607,7 @@ static inline struct mlx4_cqe *mlx4_en_get_cqe(void *buf, int idx, int cqe_sz)
-
- #define MLX4_EN_WOL_DO_MODIFY (1ULL << 63)
-
-+void mlx4_en_init_ptys2ethtool_map(void);
- void mlx4_en_update_loopback_state(struct net_device *dev,
- netdev_features_t features);
-
--
2.6.0.rc2.230.g3dd15c0