From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 05/10] netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()
Date: Tue, 8 Mar 2016 11:00:45 +0100 [thread overview]
Message-ID: <1457431250-3086-6-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1457431250-3086-1-git-send-email-pablo@netfilter.org>
From: Joe Stringer <joe@ovn.org>
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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.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 a04dee5..d88da36 100644
--- a/net/ipv4/netfilter/nf_defrag_ipv4.c
+++ b/net/ipv4/netfilter/nf_defrag_ipv4.c
@@ -31,10 +31,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
next prev parent reply other threads:[~2016-03-08 10:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-08 10:00 [PATCH 00/10] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2016-03-08 10:00 ` [PATCH 01/10] netfilter: ipvs: Remove noisy debug print from ip_vs_del_service Pablo Neira Ayuso
2016-03-08 10:00 ` [PATCH 02/10] netfilter: ipvs: avoid unused variable warnings Pablo Neira Ayuso
2016-03-08 10:00 ` [PATCH 03/10] netfilter: meta: add PRANDOM support Pablo Neira Ayuso
2016-03-08 10:00 ` [PATCH 04/10] netfilter: xt_osf: remove unused variable Pablo Neira Ayuso
2016-03-08 10:00 ` Pablo Neira Ayuso [this message]
2016-03-08 10:00 ` [PATCH 06/10] netfilter: xtables: prepare for on-demand hook register Pablo Neira Ayuso
2016-03-08 10:00 ` [PATCH 07/10] netfilter: xtables: don't hook tables by default Pablo Neira Ayuso
2016-03-08 10:00 ` [PATCH 08/10] netfilter: bridge: register hooks only when bridge interface is added Pablo Neira Ayuso
2016-03-08 10:00 ` [PATCH 09/10] netfilter: don't call hooks unless needed Pablo Neira Ayuso
2016-03-08 10:00 ` [PATCH 10/10] netfilter: nft_masq: support port range Pablo Neira Ayuso
2016-03-08 19:28 ` [PATCH 00/10] Netfilter/IPVS updates for net-next David Miller
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=1457431250-3086-6-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.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).