[PATCH nf-next] netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()

Subsystems: networking [general], the rest

STALE3812d

2 messages, 2 authors, 2016-03-01 · open the first message on its own page

[PATCH nf-next] netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()

From: Joe Stringer <hidden>
Date: 2016-02-03 18:00:27

Since commit 0848f6428ba3 ("inet: frags: fix defragmented packet's IP
header for af_packet"), ip_send_check() would be called twice for
defragmentation that occurs from netfilter ipv4 defrag hooks. Remove the
extra call.

Signed-off-by: Joe Stringer <redacted>
---
 net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/ipv4/netfilter/nf_defrag_ipv4.c b/net/ipv4/netfilter/nf_defrag_ipv4.c
index 6fb869f646bf..47a541578aeb 100644
--- a/net/ipv4/netfilter/nf_defrag_ipv4.c
+++ b/net/ipv4/netfilter/nf_defrag_ipv4.c
@@ -33,10 +33,8 @@ static int nf_ct_ipv4_gather_frags(struct net *net, struct sk_buff *skb,
 	err = ip_defrag(net, skb, user);
 	local_bh_enable();
 
-	if (!err) {
-		ip_send_check(ip_hdr(skb));
+	if (!err)
 		skb->ignore_df = 1;
-	}
 
 	return err;
 }
-- 
2.1.4

Re: [PATCH nf-next] netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()

From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: 2016-03-01 19:42:35

On Wed, Feb 03, 2016 at 10:00:10AM -0800, Joe Stringer wrote:
Since commit 0848f6428ba3 ("inet: frags: fix defragmented packet's IP
header for af_packet"), ip_send_check() would be called twice for
defragmentation that occurs from netfilter ipv4 defrag hooks. Remove the
extra call.
Applied, thanks Joe.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help