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

Commit 9668c936 authored by Philippe Reynes's avatar Philippe Reynes Committed by Jeff Kirsher
Browse files

ixgbevf: 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>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 7ee814d7

drivers/net/ethernet/intel/ixgbevf/ethtool.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -91,18 +91,18 @@ static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = { 




#define IXGBEVF_TEST_LEN (sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN)

#define IXGBEVF_TEST_LEN (sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN)





static int ixgbevf_get_settings(struct net_device *netdev,

static int ixgbevf_get_link_ksettings(struct net_device *netdev,

				struct ethtool_cmd *ecmd)

				      struct ethtool_link_ksettings *cmd)

{

{

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_hw *hw = &adapter->hw;

	u32 link_speed = 0;

	u32 link_speed = 0;

	bool link_up;

	bool link_up;





	ecmd->supported = SUPPORTED_10000baseT_Full;

	ethtool_link_ksettings_zero_link_mode(cmd, supported);

	ecmd->autoneg = AUTONEG_DISABLE;

	ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseT_Full);

	ecmd->transceiver = XCVR_DUMMY1;

	cmd->base.autoneg = AUTONEG_DISABLE;

	ecmd->port = -1;

	cmd->base.port = -1;





	hw->mac.get_link_status = 1;

	hw->mac.get_link_status = 1;

	hw->mac.ops.check_link(hw, &link_speed, &link_up, false);

	hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
@@ -122,11 +122,11 @@ static int ixgbevf_get_settings(struct net_device *netdev, 
			break;

			break;

		}

		}





		ethtool_cmd_speed_set(ecmd, speed);

		cmd->base.speed = speed;

		ecmd->duplex = DUPLEX_FULL;

		cmd->base.duplex = DUPLEX_FULL;

	} else {

	} else {

		ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);

		cmd->base.speed = SPEED_UNKNOWN;

		ecmd->duplex = DUPLEX_UNKNOWN;

		cmd->base.duplex = DUPLEX_UNKNOWN;

	}

	}





	return 0;

	return 0;
@@ -885,7 +885,6 @@ static int ixgbevf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, 
}

}





static const struct ethtool_ops ixgbevf_ethtool_ops = {

static const struct ethtool_ops ixgbevf_ethtool_ops = {

	.get_settings		= ixgbevf_get_settings,

	.get_drvinfo		= ixgbevf_get_drvinfo,

	.get_drvinfo		= ixgbevf_get_drvinfo,

	.get_regs_len		= ixgbevf_get_regs_len,

	.get_regs_len		= ixgbevf_get_regs_len,

	.get_regs		= ixgbevf_get_regs,

	.get_regs		= ixgbevf_get_regs,
@@ -905,6 +904,7 @@ static const struct ethtool_ops ixgbevf_ethtool_ops = { 
	.get_rxfh_indir_size	= ixgbevf_get_rxfh_indir_size,

	.get_rxfh_indir_size	= ixgbevf_get_rxfh_indir_size,

	.get_rxfh_key_size	= ixgbevf_get_rxfh_key_size,

	.get_rxfh_key_size	= ixgbevf_get_rxfh_key_size,

	.get_rxfh		= ixgbevf_get_rxfh,

	.get_rxfh		= ixgbevf_get_rxfh,

	.get_link_ksettings	= ixgbevf_get_link_ksettings,

};

};





void ixgbevf_set_ethtool_ops(struct net_device *netdev)

void ixgbevf_set_ethtool_ops(struct net_device *netdev)