From: huichao cai <chcchc88@163.com>
To: dev@dpdk.org
Cc: konstantin.ananyev@intel.com, stable@dpdk.org
Subject: [dpdk-dev] [PATCH] ip_frag: fix the buf of fragmenting IPv4 fragment
Date: Mon, 25 Oct 2021 15:55:53 +0800 [thread overview]
Message-ID: <1635148553-50086-1-git-send-email-chcchc88@163.com> (raw)
The patch ("ip_frag: fix fragmenting IPv4 fragment") introduces
a bug and needs to be rolled back. This is because the patch
and variables "flag_offset" conflict with each other.
Bugzilla ID: 835
Fixes: 567473433b7e ("ip_frag: fix fragmenting IPv4 fragment")
Cc: stable@dpdk.org
Signed-off-by: huichao cai <chcchc88@163.com>
---
lib/ip_frag/rte_ipv4_fragmentation.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
index fead5a9..2e7739d 100644
--- a/lib/ip_frag/rte_ipv4_fragmentation.c
+++ b/lib/ip_frag/rte_ipv4_fragmentation.c
@@ -75,7 +75,7 @@ static inline void __free_fragments(struct rte_mbuf *mb[], uint32_t num)
uint32_t out_pkt_pos, in_seg_data_pos;
uint32_t more_in_segs;
uint16_t fragment_offset, flag_offset, frag_size, header_len;
- uint16_t frag_bytes_remaining, not_last_frag;
+ uint16_t frag_bytes_remaining;
/*
* Formal parameter checking.
@@ -116,9 +116,7 @@ static inline void __free_fragments(struct rte_mbuf *mb[], uint32_t num)
in_seg = pkt_in;
in_seg_data_pos = header_len;
out_pkt_pos = 0;
- fragment_offset = (uint16_t)((flag_offset &
- RTE_IPV4_HDR_OFFSET_MASK) << RTE_IPV4_HDR_FO_SHIFT);
- not_last_frag = (uint16_t)(flag_offset & IPV4_HDR_MF_MASK);
+ fragment_offset = 0;
more_in_segs = 1;
while (likely(more_in_segs)) {
@@ -188,8 +186,7 @@ static inline void __free_fragments(struct rte_mbuf *mb[], uint32_t num)
__fill_ipv4hdr_frag(out_hdr, in_hdr, header_len,
(uint16_t)out_pkt->pkt_len,
- flag_offset, fragment_offset,
- not_last_frag || more_in_segs);
+ flag_offset, fragment_offset, more_in_segs);
fragment_offset = (uint16_t)(fragment_offset +
out_pkt->pkt_len - header_len);
--
1.8.3.1
next reply other threads:[~2021-10-25 7:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 7:55 huichao cai [this message]
2021-10-28 12:24 ` Ananyev, Konstantin
2021-11-08 22:54 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1635148553-50086-1-git-send-email-chcchc88@163.com \
--to=chcchc88@163.com \
--cc=dev@dpdk.org \
--cc=konstantin.ananyev@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).