]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()
authorJoe Stringer <joe@ovn.org>
Wed, 3 Feb 2016 18:00:10 +0000 (10:00 -0800)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 2 Mar 2016 19:05:22 +0000 (20:05 +0100)
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

index a04dee536b8ef8b5f4c1a085563d5d37b6fa118b..d88da36b383ccb4fa5b431b6c5cb83b218cb68ad 100644 (file)
@@ -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;
 }