summaryrefslogtreecommitdiff
path: root/lib/librte_ipsec
diff options
context:
space:
mode:
authorDavid Marchand <david.marchand@redhat.com>2019-09-27 13:30:35 +0200
committerFerruh Yigit <ferruh.yigit@intel.com>2019-10-08 12:14:31 +0200
commit7dde68cf0e1329fe4b9cee20e820cf41aefc54e6 (patch)
treed93c98862803dd7e1e468913bf4d985ec844a2ca /lib/librte_ipsec
parent89278c59d97c58ddca5cf63205176d76fc8f8b0d (diff)
downloaddpdk-7dde68cf0e1329fe4b9cee20e820cf41aefc54e6.zip
dpdk-7dde68cf0e1329fe4b9cee20e820cf41aefc54e6.tar.gz
dpdk-7dde68cf0e1329fe4b9cee20e820cf41aefc54e6.tar.xz
net: add missing rte prefix for ESP tail
This structure has been missed during the big rework. Fixes: 5ef254676752 ("net: add rte prefix to ESP structure") Cc: stable@dpdk.org Signed-off-by: David Marchand <david.marchand@redhat.com> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Diffstat (limited to 'lib/librte_ipsec')
-rw-r--r--lib/librte_ipsec/esp_inb.c14
-rw-r--r--lib/librte_ipsec/esp_outb.c8
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/librte_ipsec/esp_inb.c b/lib/librte_ipsec/esp_inb.c
index 8e3ecbc..5c653dd 100644
--- a/lib/librte_ipsec/esp_inb.c
+++ b/lib/librte_ipsec/esp_inb.c
@@ -296,15 +296,15 @@ esp_inb_pkt_prepare(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],
*/
static inline void
process_step1(struct rte_mbuf *mb, uint32_t tlen, struct rte_mbuf **ml,
- struct esp_tail *espt, uint32_t *hlen, uint32_t *tofs)
+ struct rte_esp_tail *espt, uint32_t *hlen, uint32_t *tofs)
{
- const struct esp_tail *pt;
+ const struct rte_esp_tail *pt;
uint32_t ofs;
ofs = mb->pkt_len - tlen;
hlen[0] = mb->l2_len + mb->l3_len;
ml[0] = mbuf_get_seg_ofs(mb, &ofs);
- pt = rte_pktmbuf_mtod_offset(ml[0], const struct esp_tail *, ofs);
+ pt = rte_pktmbuf_mtod_offset(ml[0], const struct rte_esp_tail *, ofs);
tofs[0] = ofs;
espt[0] = pt[0];
}
@@ -341,7 +341,7 @@ check_pad_bytes(struct rte_mbuf *mb, uint32_t ofs, uint32_t len)
*/
static inline int32_t
trs_process_check(struct rte_mbuf *mb, struct rte_mbuf **ml,
- uint32_t *tofs, struct esp_tail espt, uint32_t hlen, uint32_t tlen)
+ uint32_t *tofs, struct rte_esp_tail espt, uint32_t hlen, uint32_t tlen)
{
if ((mb->ol_flags & PKT_RX_SEC_OFFLOAD_FAILED) != 0 ||
tlen + hlen > mb->pkt_len)
@@ -364,7 +364,7 @@ trs_process_check(struct rte_mbuf *mb, struct rte_mbuf **ml,
*/
static inline int32_t
tun_process_check(struct rte_mbuf *mb, struct rte_mbuf **ml,
- uint32_t *tofs, struct esp_tail espt, uint32_t hlen, uint32_t tlen,
+ uint32_t *tofs, struct rte_esp_tail espt, uint32_t hlen, uint32_t tlen,
uint8_t proto)
{
return (trs_process_check(mb, ml, tofs, espt, hlen, tlen) ||
@@ -462,7 +462,7 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],
{
uint32_t adj, i, k, tl;
uint32_t hl[num], to[num];
- struct esp_tail espt[num];
+ struct rte_esp_tail espt[num];
struct rte_mbuf *ml[num];
const void *outh;
void *inh;
@@ -523,7 +523,7 @@ trs_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],
char *np;
uint32_t i, k, l2, tl;
uint32_t hl[num], to[num];
- struct esp_tail espt[num];
+ struct rte_esp_tail espt[num];
struct rte_mbuf *ml[num];
/*
diff --git a/lib/librte_ipsec/esp_outb.c b/lib/librte_ipsec/esp_outb.c
index 55799a8..e983b25 100644
--- a/lib/librte_ipsec/esp_outb.c
+++ b/lib/librte_ipsec/esp_outb.c
@@ -109,7 +109,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
uint32_t clen, hlen, l2len, pdlen, pdofs, plen, tlen;
struct rte_mbuf *ml;
struct rte_esp_hdr *esph;
- struct esp_tail *espt;
+ struct rte_esp_tail *espt;
char *ph, *pt;
uint64_t *iv;
@@ -173,7 +173,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
rte_memcpy(pt, esp_pad_bytes, pdlen);
/* update esp trailer */
- espt = (struct esp_tail *)(pt + pdlen);
+ espt = (struct rte_esp_tail *)(pt + pdlen);
espt->pad_len = pdlen;
espt->next_proto = sa->proto;
@@ -277,7 +277,7 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
uint32_t clen, hlen, pdlen, pdofs, plen, tlen, uhlen;
struct rte_mbuf *ml;
struct rte_esp_hdr *esph;
- struct esp_tail *espt;
+ struct rte_esp_tail *espt;
char *ph, *pt;
uint64_t *iv;
@@ -336,7 +336,7 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
rte_memcpy(pt, esp_pad_bytes, pdlen);
/* update esp trailer */
- espt = (struct esp_tail *)(pt + pdlen);
+ espt = (struct rte_esp_tail *)(pt + pdlen);
espt->pad_len = pdlen;
espt->next_proto = np;