net/hns3: fix delay for waiting to stop Rx/Tx

[dpdk.git] / drivers / net / hns3 / hns3_flow.c

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 4511a49..82810e0 100644 (file)
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -223,6 +223,8 @@ hns3_counter_query(struct rte_eth_dev *dev, struct rte_flow *flow,
        }
        qc->hits_set = 1;
        qc->hits = value;
+       qc->bytes_set = 0;
+       qc->bytes = 0;
 
        return 0;
 }
@@ -1054,37 +1056,37 @@ hns3_parse_normal(const struct rte_flow_item *item, struct hns3_fdir_rule *rule,
        case RTE_FLOW_ITEM_TYPE_ETH:
                ret = hns3_parse_eth(item, rule, error);
                step_mngr->items = L2_next_items;
-               step_mngr->count = ARRAY_SIZE(L2_next_items);
+               step_mngr->count = RTE_DIM(L2_next_items);
                break;
        case RTE_FLOW_ITEM_TYPE_VLAN:
                ret = hns3_parse_vlan(item, rule, error);
                step_mngr->items = L2_next_items;
-               step_mngr->count = ARRAY_SIZE(L2_next_items);
+               step_mngr->count = RTE_DIM(L2_next_items);
                break;
        case RTE_FLOW_ITEM_TYPE_IPV4:
                ret = hns3_parse_ipv4(item, rule, error);
                step_mngr->items = L3_next_items;
-               step_mngr->count = ARRAY_SIZE(L3_next_items);
+               step_mngr->count = RTE_DIM(L3_next_items);
                break;
        case RTE_FLOW_ITEM_TYPE_IPV6:
                ret = hns3_parse_ipv6(item, rule, error);
                step_mngr->items = L3_next_items;
-               step_mngr->count = ARRAY_SIZE(L3_next_items);
+               step_mngr->count = RTE_DIM(L3_next_items);
                break;
        case RTE_FLOW_ITEM_TYPE_TCP:
                ret = hns3_parse_tcp(item, rule, error);
                step_mngr->items = L4_next_items;
-               step_mngr->count = ARRAY_SIZE(L4_next_items);
+               step_mngr->count = RTE_DIM(L4_next_items);
                break;
        case RTE_FLOW_ITEM_TYPE_UDP:
                ret = hns3_parse_udp(item, rule, error);
                step_mngr->items = L4_next_items;
-               step_mngr->count = ARRAY_SIZE(L4_next_items);
+               step_mngr->count = RTE_DIM(L4_next_items);
                break;
        case RTE_FLOW_ITEM_TYPE_SCTP:
                ret = hns3_parse_sctp(item, rule, error);
                step_mngr->items = L4_next_items;
-               step_mngr->count = ARRAY_SIZE(L4_next_items);
+               step_mngr->count = RTE_DIM(L4_next_items);
                break;
        default:
                return rte_flow_error_set(error, ENOTSUP,
@@ -1188,7 +1190,7 @@ hns3_parse_fdir_filter(struct rte_eth_dev *dev,
                                          "Fdir not supported in VF");
 
        step_mngr.items = first_items;
-       step_mngr.count = ARRAY_SIZE(first_items);
+       step_mngr.count = RTE_DIM(first_items);
        for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
                if (item->type == RTE_FLOW_ITEM_TYPE_VOID)
                        continue;
@@ -1202,7 +1204,7 @@ hns3_parse_fdir_filter(struct rte_eth_dev *dev,
                        if (ret)
                                return ret;
                        step_mngr.items = tunnel_next_items;
-                       step_mngr.count = ARRAY_SIZE(tunnel_next_items);
+                       step_mngr.count = RTE_DIM(tunnel_next_items);
                } else {
                        ret = hns3_parse_normal(item, rule, &step_mngr, error);
                        if (ret)
@@ -1556,7 +1558,7 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
                     hw->rss_info.conf.types;
        if (flow_types != rss_flow_conf.types)
                hns3_warn(hw, "modified RSS types based on hardware support, "
-                             "requested:%" PRIx64 " configured:%" PRIx64,
+                             "requested:0x%" PRIx64 " configured:0x%" PRIx64,
                          rss_flow_conf.types, flow_types);
        /* Update the useful flow types */
        rss_flow_conf.types = flow_types;