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

_apply patch failure_

Submitter: Steve Yang <stevex.yang@intel.com>
Date: Thursday, November 10 2022 07:25:29 
Applied on: CommitID:5d6740652827ed3ef3625c04cca727ddcbcf6ca6
Apply patch set 119708 failed:

Checking patch drivers/net/iavf/iavf_hash.c...
error: while searching for:
	struct virtchnl_proto_hdr *hdr2;
	int i, shift_count = 1;
	int tun_lvl = proto_hdrs->tunnel_level;
	int phdrs_count = 0;

	if (!(phint & IAVF_PHINT_GTPU_MSK) && !(phint & IAVF_PHINT_GRE))
		return;

error: patch failed: drivers/net/iavf/iavf_hash.c:1210
error: while searching for:
		if (phint & IAVF_PHINT_LAYERS_MSK)
			shift_count = 2;

		phdrs_count = proto_hdrs->count;
		/* shift headers layer */
		for (i = phdrs_count - 1 + shift_count;
		     i > shift_count - 1; i--) {
			hdr1 = &proto_hdrs->proto_hdr[i];
			hdr2 = &proto_hdrs->proto_hdr[i - shift_count];

error: patch failed: drivers/net/iavf/iavf_hash.c:1219
Hunk #5 succeeded at 1279 (offset 1 line).
Hunk #6 succeeded at 1286 (offset 1 line).
Hunk #7 succeeded at 1299 (offset 1 line).
Hunk #8 succeeded at 1423 (offset 1 line).
Hunk #9 succeeded at 1483 (offset 1 line).
Applying patch drivers/net/iavf/iavf_hash.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
diff a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c	(rejected hunks)
@@ -1210,7 +1208,6 @@ iavf_refine_proto_hdrs_by_pattern(struct virtchnl_proto_hdrs *proto_hdrs,
 	struct virtchnl_proto_hdr *hdr2;
 	int i, shift_count = 1;
 	int tun_lvl = proto_hdrs->tunnel_level;
-	int phdrs_count = 0;
 
 	if (!(phint & IAVF_PHINT_GTPU_MSK) && !(phint & IAVF_PHINT_GRE))
 		return;
@@ -1219,9 +1216,8 @@ iavf_refine_proto_hdrs_by_pattern(struct virtchnl_proto_hdrs *proto_hdrs,
 		if (phint & IAVF_PHINT_LAYERS_MSK)
 			shift_count = 2;
 
-		phdrs_count = proto_hdrs->count;
 		/* shift headers layer */
-		for (i = phdrs_count - 1 + shift_count;
+		for (i = proto_hdrs->count - 1 + shift_count;
 		     i > shift_count - 1; i--) {
 			hdr1 = &proto_hdrs->proto_hdr[i];
 			hdr2 = &proto_hdrs->proto_hdr[i - shift_count];

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

UNH-IOL DPDK Community Lab