net/mlx5: add C++ include guard to public header

[dpdk.git] / drivers / net / cnxk / cn10k_ethdev.c

diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
index f7eb0f4..8378cbf 100644 (file)
--- a/drivers/net/cnxk/cn10k_ethdev.c
+++ b/drivers/net/cnxk/cn10k_ethdev.c
@@ -50,15 +50,15 @@ nix_tx_offload_flags(struct rte_eth_dev *eth_dev)
        uint16_t flags = 0;
 
        /* Fastpath is dependent on these enums */
-       RTE_BUILD_BUG_ON(PKT_TX_TCP_CKSUM != (1ULL << 52));
-       RTE_BUILD_BUG_ON(PKT_TX_SCTP_CKSUM != (2ULL << 52));
-       RTE_BUILD_BUG_ON(PKT_TX_UDP_CKSUM != (3ULL << 52));
-       RTE_BUILD_BUG_ON(PKT_TX_IP_CKSUM != (1ULL << 54));
-       RTE_BUILD_BUG_ON(PKT_TX_IPV4 != (1ULL << 55));
-       RTE_BUILD_BUG_ON(PKT_TX_OUTER_IP_CKSUM != (1ULL << 58));
-       RTE_BUILD_BUG_ON(PKT_TX_OUTER_IPV4 != (1ULL << 59));
-       RTE_BUILD_BUG_ON(PKT_TX_OUTER_IPV6 != (1ULL << 60));
-       RTE_BUILD_BUG_ON(PKT_TX_OUTER_UDP_CKSUM != (1ULL << 41));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_TCP_CKSUM != (1ULL << 52));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_SCTP_CKSUM != (2ULL << 52));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_UDP_CKSUM != (3ULL << 52));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_IP_CKSUM != (1ULL << 54));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_IPV4 != (1ULL << 55));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_OUTER_IP_CKSUM != (1ULL << 58));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_OUTER_IPV4 != (1ULL << 59));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_OUTER_IPV6 != (1ULL << 60));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_OUTER_UDP_CKSUM != (1ULL << 41));
        RTE_BUILD_BUG_ON(RTE_MBUF_L2_LEN_BITS != 7);
        RTE_BUILD_BUG_ON(RTE_MBUF_L3_LEN_BITS != 9);
        RTE_BUILD_BUG_ON(RTE_MBUF_OUTL2_LEN_BITS != 7);
@@ -553,10 +553,15 @@ cn10k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 
        dev = cnxk_eth_pmd_priv(eth_dev);
 
-       /* DROP_RE is not supported with inline IPSec for CN10K A0 */
-       if (roc_model_is_cn10ka_a0() || roc_model_is_cnf10ka_a0() ||
-           roc_model_is_cnf10kb_a0())
+       /* DROP_RE is not supported with inline IPSec for CN10K A0 and
+        * when vector mode is enabled.
+        */
+       if ((roc_model_is_cn10ka_a0() || roc_model_is_cnf10ka_a0() ||
+            roc_model_is_cnf10kb_a0()) &&
+           !roc_env_is_asim()) {
                dev->ipsecd_drop_re_dis = 1;
+               dev->vec_drop_re_dis = 1;
+       }
 
        /* Register up msg callbacks for PTP information */
        roc_nix_ptp_info_cb_register(&dev->nix, cn10k_nix_ptp_info_update_cb);