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
vhost: remove concurrent enqueue
[dpdk.git]
/
lib
/
librte_ip_frag
/
rte_ipv4_fragmentation.c
diff --git
a/lib/librte_ip_frag/rte_ipv4_fragmentation.c
b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
index
0b10310
..
a2259e8
100644
(file)
--- a/
lib/librte_ip_frag/rte_ipv4_fragmentation.c
+++ b/
lib/librte_ip_frag/rte_ipv4_fragmentation.c
@@
-107,9
+107,9
@@
rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
frag_size = (uint16_t)(mtu_size - sizeof(struct ipv4_hdr));
/* Fragment size should be a multiply of 8. */
frag_size = (uint16_t)(mtu_size - sizeof(struct ipv4_hdr));
/* Fragment size should be a multiply of 8. */
-
IP_FRAG
_ASSERT((frag_size & IPV4_HDR_FO_MASK) == 0);
+
RTE
_ASSERT((frag_size & IPV4_HDR_FO_MASK) == 0);
- in_hdr =
(struct ipv4_hdr *) pkt_in->data
;
+ in_hdr =
rte_pktmbuf_mtod(pkt_in, struct ipv4_hdr *)
;
flag_offset = rte_cpu_to_be_16(in_hdr->fragment_offset);
/* If Don't Fragment flag is set */
flag_offset = rte_cpu_to_be_16(in_hdr->fragment_offset);
/* If Don't Fragment flag is set */
@@
-165,7
+165,7
@@
rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
if (len > (in_seg->data_len - in_seg_data_pos)) {
len = in_seg->data_len - in_seg_data_pos;
}
if (len > (in_seg->data_len - in_seg_data_pos)) {
len = in_seg->data_len - in_seg_data_pos;
}
- out_seg->data
= (char*) in_seg->data + (uint16_t)
in_seg_data_pos;
+ 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_seg->data_len = (uint16_t)len;
out_pkt->pkt_len = (uint16_t)(len +
out_pkt->pkt_len);
@@
-188,7
+188,7
@@
rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
/* Build the IP header */
/* Build the IP header */
- out_hdr =
(struct ipv4_hdr*) out_pkt->data
;
+ out_hdr =
rte_pktmbuf_mtod(out_pkt, struct ipv4_hdr *)
;
__fill_ipv4hdr_frag(out_hdr, in_hdr,
(uint16_t)out_pkt->pkt_len,
__fill_ipv4hdr_frag(out_hdr, in_hdr,
(uint16_t)out_pkt->pkt_len,
@@
-198,7
+198,7
@@
rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
out_pkt->pkt_len - sizeof(struct ipv4_hdr));
out_pkt->ol_flags |= PKT_TX_IP_CKSUM;
out_pkt->pkt_len - sizeof(struct ipv4_hdr));
out_pkt->ol_flags |= PKT_TX_IP_CKSUM;
- out_pkt->
vlan_macip.f.
l3_len = sizeof(struct ipv4_hdr);
+ out_pkt->l3_len = sizeof(struct ipv4_hdr);
/* Write the fragment to the output list */
pkts_out[out_pkt_pos] = out_pkt;
/* Write the fragment to the output list */
pkts_out[out_pkt_pos] = out_pkt;