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:
parent
5c5d244bd3
commit
5a57d4c7fd
|
@ -146,8 +146,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
|
|||
|
||||
#define ICMP6MSGOUT_INC_STATS(net, idev, field) ({ (void)(net); \
|
||||
_DEVINC(icmpv6msg, , idev, field +256); })
|
||||
#define ICMP6MSGOUT_INC_STATS_BH(idev, field) \
|
||||
_DEVINC(icmpv6msg, _BH, idev, field +256)
|
||||
#define ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \
|
||||
_DEVINC(icmpv6msg, _BH, idev, field +256); })
|
||||
#define ICMP6MSGIN_INC_STATS(idev, field) \
|
||||
_DEVINC(icmpv6msg, , idev, field)
|
||||
#define ICMP6MSGIN_INC_STATS_BH(idev, field) \
|
||||
|
|
|
@ -1482,7 +1482,7 @@ int ip6_push_pending_frames(struct sock *sk)
|
|||
if (proto == IPPROTO_ICMPV6) {
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
@ -1474,7 +1474,7 @@ static void mld_sendpack(struct sk_buff *skb)
|
|||
dst_output);
|
||||
out:
|
||||
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);
|
||||
IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS);
|
||||
} else
|
||||
|
|
Loading…
Reference in a new issue