aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@redhat.com>2014-08-01 06:29:43 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-02 18:31:31 -0400
commitd2373862b3589260f0139a6e4969478f84154369 (patch)
tree3f488ce44f0f498e6bcc29c991451820393748c5 /net
parenta5536e109453bc625461d287619f4bffe233ade9 (diff)
inet: frags: use INC_STATS_BH in the ipv6 reassembly code
Softirqs are already disabled so no need to do it again, thus let's be consistent and use the IP6_INC_STATS_BH variant. Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/reassembly.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index f1709c4a289a..512ccc027ce3 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -355,8 +355,8 @@ found:
355discard_fq: 355discard_fq:
356 inet_frag_kill(&fq->q, &ip6_frags); 356 inet_frag_kill(&fq->q, &ip6_frags);
357err: 357err:
358 IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), 358 IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),
359 IPSTATS_MIB_REASMFAILS); 359 IPSTATS_MIB_REASMFAILS);
360 kfree_skb(skb); 360 kfree_skb(skb);
361 return -1; 361 return -1;
362} 362}
@@ -566,7 +566,8 @@ static int ipv6_frag_rcv(struct sk_buff *skb)
566 return -1; 566 return -1;
567 567
568fail_hdr: 568fail_hdr:
569 IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_INHDRERRORS); 569 IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),
570 IPSTATS_MIB_INHDRERRORS);
570 icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, skb_network_header_len(skb)); 571 icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, skb_network_header_len(skb));
571 return -1; 572 return -1;
572} 573}