|WARNING| pw106643-106645 [PATCH] [6/6] net/hns3: delete duplicate code

[dpdklab@iol.unh.edu]

[-- Attachment #1: Type: text/plain, Size: 3082 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/106643

_apply patch failure_

Submitter: Min Hu (Connor) <humin29@huawei.com>
Date: Friday, January 28 2022 02:07:08 
Applied on: CommitID:d91998ff68fe23f351523235e5f37ec679de6b65
Apply patch set 106643-106645 failed:

Checking patch drivers/net/hns3/hns3_flow.c...
Hunk #1 succeeded at 1238 (offset -48 lines).
error: while searching for:
		func_is_same = (with->func != RTE_ETH_HASH_FUNCTION_DEFAULT) ?
				(comp->func == with->func) : true;

	return (func_is_same &&
		comp->types == (with->types & HNS3_ETH_RSS_SUPPORT) &&
		comp->level == with->level && comp->key_len == with->key_len &&
		comp->queue_num == with->queue_num &&
		!memcmp(comp->key, with->key, with->key_len) &&
		!memcmp(comp->queue, with->queue,
			sizeof(*with->queue) * with->queue_num));
}

error: patch failed: drivers/net/hns3/hns3_flow.c:1302
Applying patch drivers/net/hns3/hns3_flow.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
diff a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c	(rejected hunks)
@@ -1302,11 +1303,16 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,
 		func_is_same = (with->func != RTE_ETH_HASH_FUNCTION_DEFAULT) ?
 				(comp->func == with->func) : true;
 
-	return (func_is_same &&
+	if (with->key_len == 0 || with->key == NULL)
+		rss_key_is_same = 1;
+	else
+		rss_key_is_same = comp->key_len == with->key_len &&
+		!memcmp(comp->key, with->key, with->key_len);
+
+	return (func_is_same && rss_key_is_same &&
 		comp->types == (with->types & HNS3_ETH_RSS_SUPPORT) &&
-		comp->level == with->level && comp->key_len == with->key_len &&
+		comp->level == with->level &&
 		comp->queue_num == with->queue_num &&
-		!memcmp(comp->key, with->key, with->key_len) &&
 		!memcmp(comp->queue, with->queue,
 			sizeof(*with->queue) * with->queue_num));
 }
Checking patch drivers/net/hns3/hns3_ethdev.c...
error: while searching for:
	if (ret)
		return ret;

	if (hw->revision < PCI_REVISION_ID_HIP09_A) {
		hns3_set_default_dev_specifications(hw);
		hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_RSV_ONE;

error: patch failed: drivers/net/hns3/hns3_ethdev.c:2733
Checking patch drivers/net/hns3/hns3_ethdev.h...
Hunk #1 succeeded at 502 (offset 2 lines).
Checking patch drivers/net/hns3/hns3_stats.c...
Checking patch drivers/net/hns3/hns3_stats.h...
Applying patch drivers/net/hns3/hns3_ethdev.c with 1 reject...
Rejected hunk #1.
Applied patch drivers/net/hns3/hns3_ethdev.h cleanly.
Applied patch drivers/net/hns3/hns3_stats.c cleanly.
Applied patch drivers/net/hns3/hns3_stats.h cleanly.
diff a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c	(rejected hunks)
@@ -2733,6 +2733,10 @@ hns3_get_capability(struct hns3_hw *hw)
 	if (ret)
 		return ret;
 
+	ret = hns3_query_mac_stats_reg_num(hw);
+	if (ret)
+		return ret;
+
 	if (hw->revision < PCI_REVISION_ID_HIP09_A) {
 		hns3_set_default_dev_specifications(hw);
 		hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_RSV_ONE;

https://lab.dpdk.org/results/dashboard/patchsets/20849/

UNH-IOL DPDK Community Lab