common/sfc_efx/base: add flag to use Rx prefix user flag

[dpdk.git] / drivers / crypto / octeontx2 / otx2_ipsec_po_ops.h

diff --git a/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h b/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
index f4cab19..25ee10f 100644 (file)
--- a/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
+++ b/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
@@ -26,7 +26,7 @@ otx2_ipsec_po_out_rlen_get(struct otx2_sec_session_ipsec_lp *sess,
 
 static __rte_always_inline struct cpt_request_info *
 alloc_request_struct(char *maddr, void *cop, int mdata_len,
-                    enum rte_security_ipsec_tunnel_type tunnel_type)
+                    enum otx2_ipsec_po_mode_type mode_type)
 {
        struct cpt_request_info *req;
        struct cpt_meta_info *meta;
@@ -48,7 +48,7 @@ alloc_request_struct(char *maddr, void *cop, int mdata_len,
        op[1] = (uintptr_t)cop;
        op[2] = (uintptr_t)req;
        op[3] = mdata_len;
-       op[4] = tunnel_type;
+       op[4] = mode_type;
 
        return req;
 }
@@ -61,7 +61,6 @@ process_outb_sa(struct rte_crypto_op *cop,
        uint32_t dlen, rlen, extend_head, extend_tail;
        struct rte_crypto_sym_op *sym_op = cop->sym;
        struct rte_mbuf *m_src = sym_op->m_src;
-       struct otx2_ipsec_po_sa_ctl *ctl_wrd;
        struct cpt_request_info *req = NULL;
        struct otx2_ipsec_po_out_hdr *hdr;
        struct otx2_ipsec_po_out_sa *sa;
@@ -70,7 +69,6 @@ process_outb_sa(struct rte_crypto_op *cop,
        char *mdata, *data;
 
        sa = &sess->out_sa;
-       ctl_wrd = &sa->ctl;
        hdr_len = sizeof(*hdr);
 
        dlen = rte_pktmbuf_pkt_len(m_src) + hdr_len;
@@ -89,7 +87,7 @@ process_outb_sa(struct rte_crypto_op *cop,
 
        mdata += extend_tail; /* mdata follows encrypted data */
        req = alloc_request_struct(mdata, (void *)cop, mdata_len,
-               sess->tunnel_type);
+               sess->mode_type);
 
        data = rte_pktmbuf_prepend(m_src, extend_head);
        if (unlikely(data == NULL)) {
@@ -107,14 +105,8 @@ process_outb_sa(struct rte_crypto_op *cop,
        hdr = (struct otx2_ipsec_po_out_hdr *)rte_pktmbuf_adj(m_src,
                                                        RTE_ETHER_HDR_LEN);
 
-       if (ctl_wrd->enc_type == OTX2_IPSEC_FP_SA_ENC_AES_GCM) {
-               memcpy(&hdr->iv[0], &sa->iv.gcm.nonce, 4);
-               memcpy(&hdr->iv[4], rte_crypto_op_ctod_offset(cop, uint8_t *,
-                       sess->iv_offset), sess->iv_length);
-       } else if (ctl_wrd->auth_type == OTX2_IPSEC_PO_SA_AUTH_SHA1) {
-               memcpy(&hdr->iv[0], rte_crypto_op_ctod_offset(cop, uint8_t *,
-                       sess->iv_offset), sess->iv_length);
-       }
+       memcpy(&hdr->iv[0], rte_crypto_op_ctod_offset(cop, uint8_t *,
+               sess->iv_offset), sess->iv_length);
 
        /* Prepare CPT instruction */
        word0.u64 = sess->ucmd_w0;
@@ -162,7 +154,7 @@ process_inb_sa(struct rte_crypto_op *cop,
        }
 
        req = alloc_request_struct(mdata, (void *)cop, mdata_len,
-               sess->tunnel_type);
+               sess->mode_type);
 
        /* Prepare CPT instruction */
        word0.u64 = sess->ucmd_w0;