diff options
| author |   Joe Stringer <joe@ovn.org> | 2016-02-03 10:00:10 -0800 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2016-03-02 20:05:22 +0100 |
| commit | 5f547391f5f25bb71f27860ad25bd1e4715f0752 (patch) | |
| tree | f75131d0d27bedb40e2a1da805242e8f8ccd30bf /net/ipv4/netfilter/nf_defrag_ipv4.c | |
| parent | Merge tag 'ipvs-for-v4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next into HEAD (diff) | |
| download | linux-dev-5f547391f5f25bb71f27860ad25bd1e4715f0752.tar.xz linux-dev-5f547391f5f25bb71f27860ad25bd1e4715f0752.zip | |
netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()
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>
Diffstat (limited to 'net/ipv4/netfilter/nf_defrag_ipv4.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_defrag_ipv4.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/nf_defrag_ipv4.c b/net/ipv4/netfilter/nf_defrag_ipv4.c index a04dee536b8e..d88da36b383c 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; } |