lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv6: added net argument to ICMP6MSGIN_INC_STATS_BH

Browse Source 
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:54 -07:00
committed by David S. Miller
parent a712d3e859
commit 55d43808eb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/ipv6.h
View File

@@ -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
{ {

2
net/ipv6/icmp.c
View File

@@ -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: