* [PATCH nf-next] netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()
@ 2016-02-03 18:00 Joe Stringer
2016-03-01 19:42 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Joe Stringer @ 2016-02-03 18:00 UTC (permalink / raw)
To: netdev, netfilter-devel
Cc: Joe Stringer, linux-kernel, pablo, edjee, edumazet
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 <joe@ovn.org>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH nf-next] netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()
2016-02-03 18:00 [PATCH nf-next] netfilter: nf_defrag_ipv4: Drop redundant ip_send_check() Joe Stringer
@ 2016-03-01 19:42 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2016-03-01 19:42 UTC (permalink / raw)
To: Joe Stringer; +Cc: netdev, netfilter-devel, linux-kernel, edjee, edumazet
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-01 19:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-03 18:00 [PATCH nf-next] netfilter: nf_defrag_ipv4: Drop redundant ip_send_check() Joe Stringer
2016-03-01 19:42 ` Pablo Neira Ayuso
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).