Commit e291eff3 authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: refactor out hclge_set_rss_tuple() 



To make it more readable and maintainable, split
hclge_set_rss_tuple() into two parts.

Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb0faf32

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+29 −13
Original line number Diff line number Diff line
@@ -4501,22 +4501,12 @@ static u8 hclge_get_rss_hash_bits(struct ethtool_rxnfc *nfc) 
	return hash_sets;

}



static int hclge_set_rss_tuple(struct hnae3_handle *handle,

			       struct ethtool_rxnfc *nfc)

static int hclge_init_rss_tuple_cmd(struct hclge_vport *vport,

				    struct ethtool_rxnfc *nfc,

				    struct hclge_rss_input_tuple_cmd *req)

{

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;

	struct hclge_rss_input_tuple_cmd *req;

	struct hclge_desc desc;

	u8 tuple_sets;

	int ret;



	if (nfc->data & ~(RXH_IP_SRC | RXH_IP_DST |

			  RXH_L4_B_0_1 | RXH_L4_B_2_3))

		return -EINVAL;



	req = (struct hclge_rss_input_tuple_cmd *)desc.data;

	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RSS_INPUT_TUPLE, false);



	req->ipv4_tcp_en = vport->rss_tuple_sets.ipv4_tcp_en;

	req->ipv4_udp_en = vport->rss_tuple_sets.ipv4_udp_en;
@@ -4561,6 +4551,32 @@ static int hclge_set_rss_tuple(struct hnae3_handle *handle, 
		return -EINVAL;

	}



	return 0;

}



static int hclge_set_rss_tuple(struct hnae3_handle *handle,

			       struct ethtool_rxnfc *nfc)

{

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;

	struct hclge_rss_input_tuple_cmd *req;

	struct hclge_desc desc;

	int ret;



	if (nfc->data & ~(RXH_IP_SRC | RXH_IP_DST |

			  RXH_L4_B_0_1 | RXH_L4_B_2_3))

		return -EINVAL;



	req = (struct hclge_rss_input_tuple_cmd *)desc.data;

	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RSS_INPUT_TUPLE, false);



	ret = hclge_init_rss_tuple_cmd(vport, nfc, req);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to init rss tuple cmd, ret = %d\n", ret);

		return ret;

	}



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret) {

		dev_err(&hdev->pdev->dev,