net/sfc: fence off 8 bits in Rx mark for tunnel offload

[dpdk.git] / drivers / net / iavf / iavf_tm.c

diff --git a/drivers/net/iavf/iavf_tm.c b/drivers/net/iavf/iavf_tm.c
index 5580210..8d92062 100644 (file)
--- a/drivers/net/iavf/iavf_tm.c
+++ b/drivers/net/iavf/iavf_tm.c
@@ -321,7 +321,7 @@ iavf_tm_node_add(struct rte_eth_dev *dev, uint32_t node_id,
        }
        /* check level */
        if (level_id != RTE_TM_NODE_LEVEL_ID_ANY &&
-           level_id != parent_node_type + 1) {
+           level_id != (uint32_t)parent_node_type + 1) {
                error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS;
                error->message = "Wrong level";
                return -EINVAL;
@@ -469,9 +469,9 @@ iavf_tm_capabilities_get(struct rte_eth_dev *dev,
        cap->shaper_private_n_max = cap->n_nodes_max;
        cap->shaper_private_dual_rate_n_max = 0;
        cap->shaper_private_rate_min = 0;
-       /* GBps */
+       /* Bytes per second */
        cap->shaper_private_rate_max =
-               vf->link_speed * 1000 / IAVF_BITS_PER_BYTE;
+               (uint64_t)vf->link_speed * 1000000 / IAVF_BITS_PER_BYTE;
        cap->shaper_private_packet_mode_supported = 0;
        cap->shaper_private_byte_mode_supported = 1;
        cap->shaper_shared_n_max = 0;
@@ -544,9 +544,9 @@ iavf_level_capabilities_get(struct rte_eth_dev *dev,
                cap->nonleaf.shaper_private_supported = true;
                cap->nonleaf.shaper_private_dual_rate_supported = false;
                cap->nonleaf.shaper_private_rate_min = 0;
-               /* GBps */
+               /* Bytes per second */
                cap->nonleaf.shaper_private_rate_max =
-                       vf->link_speed * 1000 / IAVF_BITS_PER_BYTE;
+                       (uint64_t)vf->link_speed * 1000000 / IAVF_BITS_PER_BYTE;
                cap->nonleaf.shaper_private_packet_mode_supported = 0;
                cap->nonleaf.shaper_private_byte_mode_supported = 1;
                cap->nonleaf.shaper_shared_n_max = 0;
@@ -573,9 +573,9 @@ iavf_level_capabilities_get(struct rte_eth_dev *dev,
        cap->leaf.shaper_private_supported = false;
        cap->leaf.shaper_private_dual_rate_supported = false;
        cap->leaf.shaper_private_rate_min = 0;
-       /* GBps */
+       /* Bytes per second */
        cap->leaf.shaper_private_rate_max =
-               vf->link_speed * 1000 / IAVF_BITS_PER_BYTE;
+               (uint64_t)vf->link_speed * 1000000 / IAVF_BITS_PER_BYTE;
        cap->leaf.shaper_private_packet_mode_supported = 0;
        cap->leaf.shaper_private_byte_mode_supported = 1;
        cap->leaf.shaper_shared_n_max = 0;
@@ -632,8 +632,11 @@ iavf_node_capabilities_get(struct rte_eth_dev *dev,
 
        cap->shaper_private_supported = true;
        cap->shaper_private_dual_rate_supported = false;
-       cap->shaper_private_rate_min = tc_cap.shaper.committed;
-       cap->shaper_private_rate_max = tc_cap.shaper.peak;
+       /* Bytes per second */
+       cap->shaper_private_rate_min =
+               (uint64_t)tc_cap.shaper.committed * 1000 / IAVF_BITS_PER_BYTE;
+       cap->shaper_private_rate_max =
+               (uint64_t)tc_cap.shaper.peak * 1000 / IAVF_BITS_PER_BYTE;
        cap->shaper_shared_n_max = 0;
        cap->nonleaf.sched_n_children_max = vf->num_queue_pairs;
        cap->nonleaf.sched_sp_n_priorities_max = 1;