UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Denis V. Lunev 2008-10-08 10:34:14 -07:00 committed by David S. Miller
parent 5c5d244bd3
commit 5a57d4c7fd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/ipv6.h
View File

@ -146,8 +146,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
#define ICMP6MSGOUT_INC_STATS(net, idev, field) ({ (void)(net); \ #define ICMP6MSGOUT_INC_STATS(net, idev, field) ({ (void)(net); \
_DEVINC(icmpv6msg, , idev, field +256); }) _DEVINC(icmpv6msg, , idev, field +256); })
#define ICMP6MSGOUT_INC_STATS_BH(idev, field) \ #define ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \
_DEVINC(icmpv6msg, _BH, idev, field +256) _DEVINC(icmpv6msg, _BH, idev, field +256); })
#define ICMP6MSGIN_INC_STATS(idev, field) \ #define ICMP6MSGIN_INC_STATS(idev, field) \
_DEVINC(icmpv6msg, , idev, field) _DEVINC(icmpv6msg, , idev, field)
#define ICMP6MSGIN_INC_STATS_BH(idev, field) \ #define ICMP6MSGIN_INC_STATS_BH(idev, field) \

2
net/ipv6/ip6_output.c
View File

@ -1482,7 +1482,7 @@ int ip6_push_pending_frames(struct sock *sk)
if (proto == IPPROTO_ICMPV6) { if (proto == IPPROTO_ICMPV6) {
struct inet6_dev *idev = ip6_dst_idev(skb->dst); struct inet6_dev *idev = ip6_dst_idev(skb->dst);
ICMP6MSGOUT_INC_STATS_BH(idev, icmp6_hdr(skb)->icmp6_type); ICMP6MSGOUT_INC_STATS_BH(net, idev, icmp6_hdr(skb)->icmp6_type);
ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS); ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
} }

2
net/ipv6/mcast.c
View File

@ -1474,7 +1474,7 @@ static void mld_sendpack(struct sk_buff *skb)
dst_output); dst_output);
out: out:
if (!err) { if (!err) {
ICMP6MSGOUT_INC_STATS_BH(idev, ICMPV6_MLD2_REPORT); ICMP6MSGOUT_INC_STATS_BH(net, idev, ICMPV6_MLD2_REPORT);
ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS); ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS); IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS);
} else } else