git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bonding: do not activate slave twice
[dpdk.git]
/
lib
/
librte_ip_frag
/
rte_ipv6_fragmentation.c
diff --git
a/lib/librte_ip_frag/rte_ipv6_fragmentation.c
b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
index
fa04991
..
1e30004
100644
(file)
--- a/
lib/librte_ip_frag/rte_ipv6_fragmentation.c
+++ b/
lib/librte_ip_frag/rte_ipv6_fragmentation.c
@@
-46,12
+46,6
@@
*
*/
*
*/
-/* Fragment Extension Header */
-#define IPV6_HDR_MF_SHIFT 0
-#define IPV6_HDR_FO_SHIFT 3
-#define IPV6_HDR_MF_MASK (1 << IPV6_HDR_MF_SHIFT)
-#define IPV6_HDR_FO_MASK ((1 << IPV6_HDR_FO_SHIFT) - 1)
-
static inline void
__fill_ipv6hdr_frag(struct ipv6_hdr *dst,
const struct ipv6_hdr *src, uint16_t len, uint16_t fofs,
static inline void
__fill_ipv6hdr_frag(struct ipv6_hdr *dst,
const struct ipv6_hdr *src, uint16_t len, uint16_t fofs,
@@
-65,10
+59,8
@@
__fill_ipv6hdr_frag(struct ipv6_hdr *dst,
fh = (struct ipv6_extension_fragment *) ++dst;
fh->next_header = src->proto;
fh = (struct ipv6_extension_fragment *) ++dst;
fh->next_header = src->proto;
- fh->reserved1 = 0;
- fh->frag_offset = rte_cpu_to_be_16(fofs);
- fh->reserved2 = 0;
- fh->more_frags = rte_cpu_to_be_16(mf);
+ fh->reserved = 0;
+ fh->frag_data = rte_cpu_to_be_16(RTE_IPV6_SET_FRAG_DATA(fofs, mf));
fh->id = 0;
}
fh->id = 0;
}
@@
-118,14
+110,14
@@
rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
frag_size = (uint16_t)(mtu_size - sizeof(struct ipv6_hdr));
/* Fragment size should be a multiple of 8. */
frag_size = (uint16_t)(mtu_size - sizeof(struct ipv6_hdr));
/* Fragment size should be a multiple of 8. */
- IP_FRAG_ASSERT((frag_size &
IPV6_
HDR_FO_MASK) == 0);
+ IP_FRAG_ASSERT((frag_size &
~RTE_IPV6_E
HDR_FO_MASK) == 0);
/* Check that pkts_out is big enough to hold all fragments */
if (unlikely (frag_size * nb_pkts_out <
/* Check that pkts_out is big enough to hold all fragments */
if (unlikely (frag_size * nb_pkts_out <
- (uint16_t)(pkt_in->pkt
.pkt
_len - sizeof (struct ipv6_hdr))))
- return
(-EINVAL)
;
+ (uint16_t)(pkt_in->pkt_len - sizeof (struct ipv6_hdr))))
+ return
-EINVAL
;
- in_hdr =
(struct ipv6_hdr *) pkt_in->pkt.data
;
+ in_hdr =
rte_pktmbuf_mtod(pkt_in, struct ipv6_hdr *)
;
in_seg = pkt_in;
in_seg_data_pos = sizeof(struct ipv6_hdr);
in_seg = pkt_in;
in_seg_data_pos = sizeof(struct ipv6_hdr);
@@
-142,12
+134,12
@@
rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
out_pkt = rte_pktmbuf_alloc(pool_direct);
if (unlikely(out_pkt == NULL)) {
__free_fragments(pkts_out, out_pkt_pos);
out_pkt = rte_pktmbuf_alloc(pool_direct);
if (unlikely(out_pkt == NULL)) {
__free_fragments(pkts_out, out_pkt_pos);
- return
(-ENOMEM)
;
+ return
-ENOMEM
;
}
/* Reserve space for the IP header that will be built later */
}
/* Reserve space for the IP header that will be built later */
- out_pkt->
pkt.
data_len = sizeof(struct ipv6_hdr) + sizeof(struct ipv6_extension_fragment);
- out_pkt->pkt
.pkt
_len = sizeof(struct ipv6_hdr) + sizeof(struct ipv6_extension_fragment);
+ out_pkt->data_len = sizeof(struct ipv6_hdr) + sizeof(struct ipv6_extension_fragment);
+ out_pkt->pkt_len = sizeof(struct ipv6_hdr) + sizeof(struct ipv6_extension_fragment);
out_seg_prev = out_pkt;
more_out_segs = 1;
out_seg_prev = out_pkt;
more_out_segs = 1;
@@
-160,32
+152,32
@@
rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
if (unlikely(out_seg == NULL)) {
rte_pktmbuf_free(out_pkt);
__free_fragments(pkts_out, out_pkt_pos);
if (unlikely(out_seg == NULL)) {
rte_pktmbuf_free(out_pkt);
__free_fragments(pkts_out, out_pkt_pos);
- return
(-ENOMEM)
;
+ return
-ENOMEM
;
}
}
- out_seg_prev->
pkt.
next = out_seg;
+ out_seg_prev->next = out_seg;
out_seg_prev = out_seg;
/* Prepare indirect buffer */
rte_pktmbuf_attach(out_seg, in_seg);
out_seg_prev = out_seg;
/* Prepare indirect buffer */
rte_pktmbuf_attach(out_seg, in_seg);
- len = mtu_size - out_pkt->pkt
.pkt
_len;
- if (len > (in_seg->
pkt.
data_len - in_seg_data_pos)) {
- len = in_seg->
pkt.
data_len - in_seg_data_pos;
+ len = mtu_size - out_pkt->pkt_len;
+ if (len > (in_seg->data_len - in_seg_data_pos)) {
+ len = in_seg->data_len - in_seg_data_pos;
}
}
- out_seg->
pkt.data = (char *) in_seg->pkt.data + (uint16_t)
in_seg_data_pos;
- out_seg->
pkt.
data_len = (uint16_t)len;
- out_pkt->pkt
.pkt
_len = (uint16_t)(len +
- out_pkt->pkt
.pkt
_len);
- out_pkt->
pkt.
nb_segs += 1;
+ out_seg->
data_off = in_seg->data_off +
in_seg_data_pos;
+ out_seg->data_len = (uint16_t)len;
+ out_pkt->pkt_len = (uint16_t)(len +
+ out_pkt->pkt_len);
+ out_pkt->nb_segs += 1;
in_seg_data_pos += len;
/* Current output packet (i.e. fragment) done ? */
in_seg_data_pos += len;
/* Current output packet (i.e. fragment) done ? */
- if (unlikely(out_pkt->pkt
.pkt
_len >= mtu_size)) {
+ if (unlikely(out_pkt->pkt_len >= mtu_size)) {
more_out_segs = 0;
}
/* Current input segment done ? */
more_out_segs = 0;
}
/* Current input segment done ? */
- if (unlikely(in_seg_data_pos == in_seg->
pkt.
data_len)) {
- in_seg = in_seg->
pkt.
next;
+ if (unlikely(in_seg_data_pos == in_seg->data_len)) {
+ in_seg = in_seg->next;
in_seg_data_pos = 0;
if (unlikely(in_seg == NULL)) {
in_seg_data_pos = 0;
if (unlikely(in_seg == NULL)) {
@@
-196,14
+188,14
@@
rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
/* Build the IP header */
/* Build the IP header */
- out_hdr =
(struct ipv6_hdr *) out_pkt->pkt.data
;
+ out_hdr =
rte_pktmbuf_mtod(out_pkt, struct ipv6_hdr *)
;
__fill_ipv6hdr_frag(out_hdr, in_hdr,
__fill_ipv6hdr_frag(out_hdr, in_hdr,
- (uint16_t) out_pkt->pkt
.pkt
_len - sizeof(struct ipv6_hdr),
+ (uint16_t) out_pkt->pkt_len - sizeof(struct ipv6_hdr),
fragment_offset, more_in_segs);
fragment_offset = (uint16_t)(fragment_offset +
fragment_offset, more_in_segs);
fragment_offset = (uint16_t)(fragment_offset +
- out_pkt->pkt
.pkt
_len - sizeof(struct ipv6_hdr)
+ out_pkt->pkt_len - sizeof(struct ipv6_hdr)
- sizeof(struct ipv6_extension_fragment));
/* Write the fragment to the output list */
- sizeof(struct ipv6_extension_fragment));
/* Write the fragment to the output list */
@@
-211,5
+203,5
@@
rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
out_pkt_pos ++;
}
out_pkt_pos ++;
}
- return
(out_pkt_pos)
;
+ return
out_pkt_pos
;
}
}