common/cnxk: fix channel number setting in MCAM entries

[dpdk.git] / lib / ipsec / esp_inb.c

diff --git a/lib/ipsec/esp_inb.c b/lib/ipsec/esp_inb.c
index 6fbe468..f159bf7 100644 (file)
--- a/lib/ipsec/esp_inb.c
+++ b/lib/ipsec/esp_inb.c
@@ -4,7 +4,6 @@
 
 #include <rte_ipsec.h>
 #include <rte_esp.h>
-#include <rte_ip.h>
 #include <rte_errno.h>
 #include <rte_cryptodev.h>
 
@@ -459,7 +458,7 @@ static inline int32_t
 trs_process_check(struct rte_mbuf *mb, struct rte_mbuf **ml,
        uint32_t *tofs, struct rte_esp_tail espt, uint32_t hlen, uint32_t tlen)
 {
-       if ((mb->ol_flags & PKT_RX_SEC_OFFLOAD_FAILED) != 0 ||
+       if ((mb->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED) != 0 ||
                        tlen + hlen > mb->pkt_len)
                return -EBADMSG;
 
@@ -475,7 +474,7 @@ trs_process_check(struct rte_mbuf *mb, struct rte_mbuf **ml,
 
 /*
  * packet checks for tunnel mode:
- * - same as for trasnport mode
+ * - same as for transport mode
  * - esp tail next proto contains expected for that SA value
  */
 static inline int32_t
@@ -547,8 +546,8 @@ trs_process_step3(struct rte_mbuf *mb)
        /* reset mbuf packet type */
        mb->packet_type &= (RTE_PTYPE_L2_MASK | RTE_PTYPE_L3_MASK);
 
-       /* clear the PKT_RX_SEC_OFFLOAD flag if set */
-       mb->ol_flags &= ~PKT_RX_SEC_OFFLOAD;
+       /* clear the RTE_MBUF_F_RX_SEC_OFFLOAD flag if set */
+       mb->ol_flags &= ~RTE_MBUF_F_RX_SEC_OFFLOAD;
 }
 
 /*
@@ -561,12 +560,12 @@ trs_process_step3(struct rte_mbuf *mb)
 static inline void
 tun_process_step3(struct rte_mbuf *mb, uint64_t txof_msk, uint64_t txof_val)
 {
-       /* reset mbuf metatdata: L2/L3 len, packet type */
+       /* reset mbuf metadata: L2/L3 len, packet type */
        mb->packet_type = RTE_PTYPE_UNKNOWN;
        mb->tx_offload = (mb->tx_offload & txof_msk) | txof_val;
 
-       /* clear the PKT_RX_SEC_OFFLOAD flag if set */
-       mb->ol_flags &= ~PKT_RX_SEC_OFFLOAD;
+       /* clear the RTE_MBUF_F_RX_SEC_OFFLOAD flag if set */
+       mb->ol_flags &= ~RTE_MBUF_F_RX_SEC_OFFLOAD;
 }
 
 /*