Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From d7fa7d59733c34f7d8083a6567ca8a0e3efb1fb6 Mon Sep 17 00:00:00 2001
|
|
From: Lijun Ou <oulijun@huawei.com>
|
|
Date: Fri, 22 Jan 2021 18:18:50 +0800
|
|
Subject: [PATCH 030/189] net/hns3: remove unnecessary parentheses
|
|
|
|
Remove unnecessary parentheses as well as keep a reasonable
|
|
blank line.
|
|
|
|
Signed-off-by: Lijun Ou <oulijun@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_flow.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
|
|
index f2bff1e..e9d0a0b 100644
|
|
--- a/drivers/net/hns3/hns3_flow.c
|
|
+++ b/drivers/net/hns3/hns3_flow.c
|
|
@@ -700,6 +700,7 @@ hns3_parse_udp(const struct rte_flow_item *item, struct hns3_fdir_rule *rule,
|
|
hns3_set_bit(rule->input_set, INNER_IP_PROTO, 1);
|
|
rule->key_conf.spec.ip_proto = IPPROTO_UDP;
|
|
rule->key_conf.mask.ip_proto = IPPROTO_MASK;
|
|
+
|
|
/* Only used to describe the protocol stack. */
|
|
if (item->spec == NULL && item->mask == NULL)
|
|
return 0;
|
|
@@ -1264,7 +1265,7 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,
|
|
if (comp->func == RTE_ETH_HASH_FUNCTION_MAX)
|
|
func_is_same = false;
|
|
else
|
|
- func_is_same = (with->func ? (comp->func == with->func) : true);
|
|
+ func_is_same = with->func ? (comp->func == with->func) : true;
|
|
|
|
return (func_is_same &&
|
|
comp->types == (with->types & HNS3_ETH_RSS_SUPPORT) &&
|
|
@@ -1861,6 +1862,7 @@ hns3_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
|
|
return rte_flow_error_set(error, EINVAL,
|
|
RTE_FLOW_ERROR_TYPE_HANDLE,
|
|
flow, "Flow is NULL");
|
|
+
|
|
filter_type = flow->filter_type;
|
|
switch (filter_type) {
|
|
case RTE_ETH_FILTER_FDIR:
|
|
--
|
|
2.7.4
|
|
|