l_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 +1988,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 e0ec280..bf7628d 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
> @@ -382,6 +382,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(_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.7.0.rc3.207.g0ac5344
>
Acked-by: Eugenia Emantayev <euge...@mellanox.com>
Reviewed-by: Eugenia Emantayev <euge...@mellanox.com>
