|WARNING| pw113424-113429 [PATCH] [6/6] net/hns3: delete the unused code

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Dongdong Liu <liudongdong3 at huawei.com>
Date: Friday, June 24 2022 08:59:51 
Applied on: CommitID:42fbb8e85d1f0b6c1d397d4e7559bc5877ba985e
Apply patch set 113424-113429 failed:

Checking patch drivers/net/hns3/hns3_cmd.c...
Checking patch drivers/net/hns3/hns3_ethdev.c...
error: while searching for:
{
	int ret;

	if (hw->mac.media_type == HNS3_MEDIA_TYPE_COPPER) {
#if defined(RTE_HNS3_ONLY_1630_FPGA)
		struct hns3_pf *pf = HNS3_DEV_HW_TO_PF(hw);
		if (pf->is_tmp_phy)
			return 0;
#endif

		ret = hns3_set_copper_port_link_speed(hw, cfg);
	} else {
		ret = hns3_set_fiber_port_link_speed(hw, cfg);
	}

	if (ret) {
		hns3_err(hw, "failed to set %s port link speed, ret = %d.",

error: patch failed: drivers/net/hns3/hns3_ethdev.c:4970
Applied patch drivers/net/hns3/hns3_cmd.c cleanly.
Applying patch drivers/net/hns3/hns3_ethdev.c with 1 reject...
Rejected hunk #1.
diff a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c	(rejected hunks)
@@ -4970,17 +4970,10 @@ hns3_set_port_link_speed(struct hns3_hw *hw,
 {
 	int ret;
 
-	if (hw->mac.media_type == HNS3_MEDIA_TYPE_COPPER) {
-#if defined(RTE_HNS3_ONLY_1630_FPGA)
-		struct hns3_pf *pf = HNS3_DEV_HW_TO_PF(hw);
-		if (pf->is_tmp_phy)
-			return 0;
-#endif
-
+	if (hw->mac.media_type == HNS3_MEDIA_TYPE_COPPER)
 		ret = hns3_set_copper_port_link_speed(hw, cfg);
-	} else {
+	else
 		ret = hns3_set_fiber_port_link_speed(hw, cfg);
-	}
 
 	if (ret) {
 		hns3_err(hw, "failed to set %s port link speed, ret = %d.",

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

UNH-IOL DPDK Community Lab