Commit 87c76c2d authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

net: ethtool: remove the duplicated handling from ethtool_get_rxrings 



ethtool_get_rxrings() was a copy of ethtool_get_rxnfc(). Clean the code
that will never be executed for GRXRINGS specifically.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20250917-gxrings-v4-3-dae520e2e1cb@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 06fad5a4

net/ethtool/ioctl.c

+10 −23
Original line number Diff line number Diff line
@@ -1212,52 +1212,39 @@ static noinline_for_stack int ethtool_get_rxrings(struct net_device *dev, 
						  u32 cmd,

						  void __user *useraddr)

{

	struct ethtool_rxnfc info;

	size_t info_size = sizeof(info);

	const struct ethtool_ops *ops = dev->ethtool_ops;

	struct ethtool_rxnfc info;

	size_t info_size;

	int ret;

	void *rule_buf = NULL;



	if (!ops->get_rxnfc)

		return -EOPNOTSUPP;



	info_size = sizeof(info);

	ret = ethtool_rxnfc_copy_struct(cmd, &info, &info_size, useraddr);

	if (ret)

		return ret;



	if (info.cmd == ETHTOOL_GRXCLSRLALL) {

		if (info.rule_cnt > 0) {

			if (info.rule_cnt <= KMALLOC_MAX_SIZE / sizeof(u32))

				rule_buf = kcalloc(info.rule_cnt, sizeof(u32),

						   GFP_USER);

			if (!rule_buf)

				return -ENOMEM;

		}

	}



	ret = ops->get_rxnfc(dev, &info, rule_buf);

	ret = ops->get_rxnfc(dev, &info, NULL);

	if (ret < 0)

		goto err_out;



	ret = ethtool_rxnfc_copy_to_user(useraddr, &info, info_size, rule_buf);

err_out:

	kfree(rule_buf);



		return ret;



	return ethtool_rxnfc_copy_to_user(useraddr, &info, info_size, NULL);

}



static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev,

						u32 cmd, void __user *useraddr)

{

	struct ethtool_rxnfc info;

	size_t info_size = sizeof(info);

	const struct ethtool_ops *ops = dev->ethtool_ops;

	int ret;

	struct ethtool_rxnfc info;

	void *rule_buf = NULL;

	size_t info_size;

	int ret;



	if (!ops->get_rxnfc)

		return -EOPNOTSUPP;



	info_size = sizeof(info);

	ret = ethtool_rxnfc_copy_struct(cmd, &info, &info_size, useraddr);

	if (ret)

		return ret;