Commit a537cfda authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'uapi-ethtool-avoid-flex-array-in-struct-ethtool_link_settings' 

Kees Cook says:

====================
UAPI: ethtool: Avoid flex-array in struct ethtool_link_settings

This reverts the tagged struct group in struct ethtool_link_settings and
instead just removes the flexible array member from Linux's view as it
is entirely unused.
====================

Link: https://patch.msgid.link/20241115204115.work.686-kees@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 920efe3e 96c677fc

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+3 −3
Original line number Diff line number Diff line
@@ -2780,7 +2780,7 @@ u32 bnxt_fw_to_ethtool_speed(u16 fw_link_speed) 
static void bnxt_get_default_speeds(struct ethtool_link_ksettings *lk_ksettings,

				    struct bnxt_link_info *link_info)

{

	struct ethtool_link_settings_hdr *base = &lk_ksettings->base;

	struct ethtool_link_settings *base = &lk_ksettings->base;



	if (link_info->link_state == BNXT_LINK_STATE_UP) {

		base->speed = bnxt_fw_to_ethtool_speed(link_info->link_speed);
@@ -2799,7 +2799,7 @@ static void bnxt_get_default_speeds(struct ethtool_link_ksettings *lk_ksettings, 
static int bnxt_get_link_ksettings(struct net_device *dev,

				   struct ethtool_link_ksettings *lk_ksettings)

{

	struct ethtool_link_settings_hdr *base = &lk_ksettings->base;

	struct ethtool_link_settings *base = &lk_ksettings->base;

	enum ethtool_link_mode_bit_indices link_mode;

	struct bnxt *bp = netdev_priv(dev);

	struct bnxt_link_info *link_info;
@@ -3022,9 +3022,9 @@ u16 bnxt_get_fw_auto_link_speeds(const unsigned long *mode) 
static int bnxt_set_link_ksettings(struct net_device *dev,

			   const struct ethtool_link_ksettings *lk_ksettings)

{

	const struct ethtool_link_settings_hdr *base = &lk_ksettings->base;

	struct bnxt *bp = netdev_priv(dev);

	struct bnxt_link_info *link_info = &bp->link_info;

	const struct ethtool_link_settings *base = &lk_ksettings->base;

	bool set_pause = false;

	u32 speed, lanes = 0;

	int rc = 0;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -662,8 +662,8 @@ static unsigned int lmm_to_fw_caps(const unsigned long *link_mode_mask) 
static int get_link_ksettings(struct net_device *dev,

			      struct ethtool_link_ksettings *link_ksettings)

{

	struct ethtool_link_settings_hdr *base = &link_ksettings->base;

	struct port_info *pi = netdev_priv(dev);

	struct ethtool_link_settings *base = &link_ksettings->base;



	/* For the nonce, the Firmware doesn't send up Port State changes

	 * when the Virtual Interface attached to the Port is down.  So
@@ -717,9 +717,9 @@ static int get_link_ksettings(struct net_device *dev, 
static int set_link_ksettings(struct net_device *dev,

			    const struct ethtool_link_ksettings *link_ksettings)

{

	const struct ethtool_link_settings_hdr *base = &link_ksettings->base;

	struct port_info *pi = netdev_priv(dev);

	struct link_config *lc = &pi->link_cfg;

	const struct ethtool_link_settings *base = &link_ksettings->base;

	struct link_config old_lc;

	unsigned int fw_caps;

	int ret = 0;

drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1436,8 +1436,8 @@ static void fw_caps_to_lmm(enum fw_port_type port_type, 
static int cxgb4vf_get_link_ksettings(struct net_device *dev,

				  struct ethtool_link_ksettings *link_ksettings)

{

	struct ethtool_link_settings_hdr *base = &link_ksettings->base;

	struct port_info *pi = netdev_priv(dev);

	struct ethtool_link_settings *base = &link_ksettings->base;



	/* For the nonce, the Firmware doesn't send up Port State changes

	 * when the Virtual Interface attached to the Port is down.  So

drivers/net/ethernet/cisco/enic/enic_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ static void enic_intr_coal_set_rx(struct enic *enic, u32 timer) 
static int enic_get_ksettings(struct net_device *netdev,

			      struct ethtool_link_ksettings *ecmd)

{

	struct ethtool_link_settings_hdr *base = &ecmd->base;

	struct enic *enic = netdev_priv(netdev);

	struct ethtool_link_settings *base = &ecmd->base;



	ethtool_link_ksettings_add_link_mode(ecmd, supported,

					     10000baseT_Full);

drivers/net/ethernet/qlogic/qede/qede_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static int qede_get_link_ksettings(struct net_device *dev, 
				   struct ethtool_link_ksettings *cmd)

{

	typeof(cmd->link_modes) *link_modes = &cmd->link_modes;

	struct ethtool_link_settings_hdr *base = &cmd->base;

	struct ethtool_link_settings *base = &cmd->base;

	struct qede_dev *edev = netdev_priv(dev);

	struct qed_link_output current_link;
@@ -537,7 +537,7 @@ static int qede_get_link_ksettings(struct net_device *dev, 
static int qede_set_link_ksettings(struct net_device *dev,

				   const struct ethtool_link_ksettings *cmd)

{

	const struct ethtool_link_settings_hdr *base = &cmd->base;

	const struct ethtool_link_settings *base = &cmd->base;

	const struct ethtool_forced_speed_map *map;

	struct qede_dev *edev = netdev_priv(dev);

	struct qed_link_output current_link;