[dpdk-stable] patch 'net/hinic/base: remove unused function parameters' has been queued to stable release 19.11.4
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Fri Jul 24 13:59:12 CEST 2020
Hi,
FYI, your patch has been queued to stable release 19.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From 5cae30960b80367cc858c79fdd04a951db88699d Mon Sep 17 00:00:00 2001
From: Xiaoyun Wang <cloud.wangxiaoyun at huawei.com>
Date: Sat, 27 Jun 2020 11:55:45 +0800
Subject: [PATCH] net/hinic/base: remove unused function parameters
[ upstream commit 214164a6bf7f840c3f111430c4e7d6373195afe1 ]
Remove unused parameters for mgmt channel with no ack.
Fixes: a4957d87e05a ("net/hinic/base: add mgmt module")
Signed-off-by: Xiaoyun Wang <cloud.wangxiaoyun at huawei.com>
---
drivers/net/hinic/base/hinic_pmd_hwdev.c | 2 +-
drivers/net/hinic/base/hinic_pmd_mgmt.c | 3 +--
drivers/net/hinic/base/hinic_pmd_mgmt.h | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/hinic/base/hinic_pmd_hwdev.c b/drivers/net/hinic/base/hinic_pmd_hwdev.c
index 45b976536..8a0faa697 100644
--- a/drivers/net/hinic/base/hinic_pmd_hwdev.c
+++ b/drivers/net/hinic/base/hinic_pmd_hwdev.c
@@ -599,7 +599,7 @@ static int hinic_pf_rx_tx_flush(struct hinic_hwdev *hwdev)
err = hinic_msg_to_mgmt_no_ack(hwdev, HINIC_MOD_COMM,
HINIC_MGMT_CMD_START_FLR, &clr_res,
- sizeof(clr_res), NULL, NULL);
+ sizeof(clr_res));
if (err) {
PMD_DRV_LOG(WARNING, "Notice flush msg failed, err: %d", err);
ret = err;
diff --git a/drivers/net/hinic/base/hinic_pmd_mgmt.c b/drivers/net/hinic/base/hinic_pmd_mgmt.c
index ea79c300a..a57036d53 100644
--- a/drivers/net/hinic/base/hinic_pmd_mgmt.c
+++ b/drivers/net/hinic/base/hinic_pmd_mgmt.c
@@ -504,8 +504,7 @@ int hinic_msg_to_mgmt_sync(void *hwdev, enum hinic_mod_type mod, u8 cmd,
}
int hinic_msg_to_mgmt_no_ack(void *hwdev, enum hinic_mod_type mod, u8 cmd,
- void *buf_in, u16 in_size, __rte_unused void *buf_out,
- __rte_unused u16 *out_size)
+ void *buf_in, u16 in_size)
{
struct hinic_msg_pf_to_mgmt *pf_to_mgmt =
((struct hinic_hwdev *)hwdev)->pf_to_mgmt;
diff --git a/drivers/net/hinic/base/hinic_pmd_mgmt.h b/drivers/net/hinic/base/hinic_pmd_mgmt.h
index 52b319ead..0f3286510 100644
--- a/drivers/net/hinic/base/hinic_pmd_mgmt.h
+++ b/drivers/net/hinic/base/hinic_pmd_mgmt.h
@@ -101,8 +101,7 @@ struct hinic_msg_pf_to_mgmt {
};
int hinic_msg_to_mgmt_no_ack(void *hwdev, enum hinic_mod_type mod, u8 cmd,
- void *buf_in, u16 in_size, void *buf_out,
- u16 *out_size);
+ void *buf_in, u16 in_size);
int hinic_comm_pf_to_mgmt_init(struct hinic_hwdev *hwdev);
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-07-24 12:53:52.940512142 +0100
+++ 0114-net-hinic-base-remove-unused-function-parameters.patch 2020-07-24 12:53:48.383008248 +0100
@@ -1,12 +1,13 @@
-From 214164a6bf7f840c3f111430c4e7d6373195afe1 Mon Sep 17 00:00:00 2001
+From 5cae30960b80367cc858c79fdd04a951db88699d Mon Sep 17 00:00:00 2001
From: Xiaoyun Wang <cloud.wangxiaoyun at huawei.com>
Date: Sat, 27 Jun 2020 11:55:45 +0800
Subject: [PATCH] net/hinic/base: remove unused function parameters
+[ upstream commit 214164a6bf7f840c3f111430c4e7d6373195afe1 ]
+
Remove unused parameters for mgmt channel with no ack.
Fixes: a4957d87e05a ("net/hinic/base: add mgmt module")
-Cc: stable at dpdk.org
Signed-off-by: Xiaoyun Wang <cloud.wangxiaoyun at huawei.com>
---
@@ -16,7 +17,7 @@
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/hinic/base/hinic_pmd_hwdev.c b/drivers/net/hinic/base/hinic_pmd_hwdev.c
-index c132de09e..a93f240e3 100644
+index 45b976536..8a0faa697 100644
--- a/drivers/net/hinic/base/hinic_pmd_hwdev.c
+++ b/drivers/net/hinic/base/hinic_pmd_hwdev.c
@@ -599,7 +599,7 @@ static int hinic_pf_rx_tx_flush(struct hinic_hwdev *hwdev)
@@ -29,7 +30,7 @@
PMD_DRV_LOG(WARNING, "Notice flush msg failed, err: %d", err);
ret = err;
diff --git a/drivers/net/hinic/base/hinic_pmd_mgmt.c b/drivers/net/hinic/base/hinic_pmd_mgmt.c
-index 94bc45f83..babb93a20 100644
+index ea79c300a..a57036d53 100644
--- a/drivers/net/hinic/base/hinic_pmd_mgmt.c
+++ b/drivers/net/hinic/base/hinic_pmd_mgmt.c
@@ -504,8 +504,7 @@ int hinic_msg_to_mgmt_sync(void *hwdev, enum hinic_mod_type mod, u8 cmd,
More information about the stable
mailing list