|WARNING| pw128070 [PATCH] net/nfp: remove unused struct fields

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Chaoyong He <chaoyong.he at corigine.com>
Date: Monday, June 05 2023 05:45:25 
Applied on: CommitID:abaa473297cf21cb81e5348185a7694ae2f221e7
Apply patch set 128070 failed:

Checking patch drivers/net/nfp/flower/nfp_flower.c...
Hunk #1 succeeded at 437 (offset -1 lines).
Checking patch drivers/net/nfp/nfp_common.h...
Hunk #1 succeeded at 145 (offset 26 lines).
error: while searching for:
	uint16_t vendor_id;
	uint16_t subsystem_device_id;
	uint16_t subsystem_vendor_id;
#if defined(DSTQ_SELECTION)
#if DSTQ_SELECTION
	uint16_t device_function;
#endif
#endif

	struct rte_ether_addr mac_addr;


error: patch failed: drivers/net/nfp/nfp_common.h:208
error: while searching for:

	struct nfp_cpp *cpp;
	struct nfp_cpp_area *ctrl_area;
	struct nfp_cpp_area *hwqueues_area;
	struct nfp_cpp_area *msix_area;
	struct nfp_cpp_area *mac_stats_area;
	uint8_t *mac_stats_bar;
	uint8_t *mac_stats;

	uint8_t *hw_queues;
	/* Sequential physical port number */
	uint8_t idx;
	/* Internal port number as seen from NFP */
	uint8_t nfp_idx;

	union eth_table_entry *eth_table;
};

struct nfp_net_adapter {

error: patch failed: drivers/net/nfp/nfp_common.h:222
Checking patch drivers/net/nfp/nfp_ethdev_vf.c...
Hunk #1 succeeded at 394 (offset -8 lines).
Hunk #2 succeeded at 437 (offset -6 lines).
Applied patch drivers/net/nfp/flower/nfp_flower.c cleanly.
Applying patch drivers/net/nfp/nfp_common.h with 2 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
Applied patch drivers/net/nfp/nfp_ethdev_vf.c cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h	(rejected hunks)
@@ -208,11 +186,6 @@ struct nfp_net_hw {
 	uint16_t vendor_id;
 	uint16_t subsystem_device_id;
 	uint16_t subsystem_vendor_id;
-#if defined(DSTQ_SELECTION)
-#if DSTQ_SELECTION
-	uint16_t device_function;
-#endif
-#endif
 
 	struct rte_ether_addr mac_addr;
 
@@ -222,19 +195,14 @@ struct nfp_net_hw {
 
 	struct nfp_cpp *cpp;
 	struct nfp_cpp_area *ctrl_area;
-	struct nfp_cpp_area *hwqueues_area;
-	struct nfp_cpp_area *msix_area;
 	struct nfp_cpp_area *mac_stats_area;
 	uint8_t *mac_stats_bar;
 	uint8_t *mac_stats;
 
-	uint8_t *hw_queues;
-	/* Sequential physical port number */
+	/* Sequential physical port number, only valid for CoreNIC firmware */
 	uint8_t idx;
 	/* Internal port number as seen from NFP */
 	uint8_t nfp_idx;
-
-	union eth_table_entry *eth_table;
 };
 
 struct nfp_net_adapter {

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

UNH-IOL DPDK Community Lab