aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-10-08 13:34:14 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-08 14:15:05 -0400
commit5a57d4c7fdac0e227efe8c5739fcbb263d9ae993 (patch)
tree77ebd3127bc823b31c1c82c1cfc6aa3a9c3f74d1
parent5c5d244bd388fe498dd7f5f57cb7770aae40b9ab (diff)
ipv6: added net argument to ICMP6MSGOUT_INC_STATS_BH
Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/ipv6.h4
-rw-r--r--net/ipv6/ip6_output.c2
-rw-r--r--net/ipv6/mcast.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 7f5a8dec1ae9..4736d8f1f286 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -146,8 +146,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
146 146
147#define ICMP6MSGOUT_INC_STATS(net, idev, field) ({ (void)(net); \ 147#define ICMP6MSGOUT_INC_STATS(net, idev, field) ({ (void)(net); \
148 _DEVINC(icmpv6msg, , idev, field +256); }) 148 _DEVINC(icmpv6msg, , idev, field +256); })
149#define ICMP6MSGOUT_INC_STATS_BH(idev, field) \ 149#define ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \
150 _DEVINC(icmpv6msg, _BH, idev, field +256) 150 _DEVINC(icmpv6msg, _BH, idev, field +256); })
151#define ICMP6MSGIN_INC_STATS(idev, field) \ 151#define ICMP6MSGIN_INC_STATS(idev, field) \
152 _DEVINC(icmpv6msg, , idev, field) 152 _DEVINC(icmpv6msg, , idev, field)
153#define ICMP6MSGIN_INC_STATS_BH(idev, field) \ 153#define ICMP6MSGIN_INC_STATS_BH(idev, field) \
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index e7eff320619c..c77db0b95e26 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1482,7 +1482,7 @@ int ip6_push_pending_frames(struct sock *sk)
1482 if (proto == IPPROTO_ICMPV6) { 1482 if (proto == IPPROTO_ICMPV6) {
1483 struct inet6_dev *idev = ip6_dst_idev(skb->dst); 1483 struct inet6_dev *idev = ip6_dst_idev(skb->dst);
1484 1484
1485 ICMP6MSGOUT_INC_STATS_BH(idev, icmp6_hdr(skb)->icmp6_type); 1485 ICMP6MSGOUT_INC_STATS_BH(net, idev, icmp6_hdr(skb)->icmp6_type);
1486 ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS); 1486 ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
1487 } 1487 }
1488 1488
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index a96e4235fbfa..d7b3c6d398ae 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1474,7 +1474,7 @@ static void mld_sendpack(struct sk_buff *skb)
1474 dst_output); 1474 dst_output);
1475out: 1475out:
1476 if (!err) { 1476 if (!err) {
1477 ICMP6MSGOUT_INC_STATS_BH(idev, ICMPV6_MLD2_REPORT); 1477 ICMP6MSGOUT_INC_STATS_BH(net, idev, ICMPV6_MLD2_REPORT);
1478 ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS); 1478 ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
1479 IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS); 1479 IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS);
1480 } else 1480 } else