提交 55d43808 编写于 作者: D Denis V. Lunev 提交者: David S. Miller

ipv6: added net argument to ICMP6MSGIN_INC_STATS_BH

Signed-off-by: NDenis V. Lunev <den@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 a712d3e8
...@@ -148,8 +148,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); ...@@ -148,8 +148,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
_DEVINC(icmpv6msg, , idev, field +256); }) _DEVINC(icmpv6msg, , idev, field +256); })
#define ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \ #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_BH(idev, field) \ #define ICMP6MSGIN_INC_STATS_BH(net, idev, field) ({ (void)(net); \
_DEVINC(icmpv6msg, _BH, idev, field) _DEVINC(icmpv6msg, _BH, idev, field); })
struct ip6_ra_chain struct ip6_ra_chain
{ {
......
...@@ -693,7 +693,7 @@ static int icmpv6_rcv(struct sk_buff *skb) ...@@ -693,7 +693,7 @@ static int icmpv6_rcv(struct sk_buff *skb)
type = hdr->icmp6_type; type = hdr->icmp6_type;
ICMP6MSGIN_INC_STATS_BH(idev, type); ICMP6MSGIN_INC_STATS_BH(dev_net(dev), idev, type);
switch (type) { switch (type) {
case ICMPV6_ECHO_REQUEST: case ICMPV6_ECHO_REQUEST:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册