Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 087fe240 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

ipv6: added net argument to _DEVINC/_DEVADD 



Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55d43808

include/net/ipv6.h

+21 −19
Original line number Diff line number Diff line
@@ -110,17 +110,19 @@ struct frag_hdr { 
extern int sysctl_mld_max_msf;

extern struct ctl_path net_ipv6_ctl_path[];



#define _DEVINC(statname, modifier, idev, field)			\

#define _DEVINC(net, statname, modifier, idev, field)			\

({									\

	struct inet6_dev *_idev = (idev);				\

	(void)(net);							\

	if (likely(_idev != NULL))					\

		SNMP_INC_STATS##modifier((_idev)->stats.statname, (field)); \

	SNMP_INC_STATS##modifier(statname##_statistics, (field));	\

})



#define _DEVADD(statname, modifier, idev, field, val)			\

#define _DEVADD(net, statname, modifier, idev, field, val)		\

({									\

	struct inet6_dev *_idev = (idev);				\

	(void)(net);							\

	if (likely(_idev != NULL))					\

		SNMP_ADD_STATS##modifier((_idev)->stats.statname, (field), (val)); \

	SNMP_ADD_STATS##modifier(statname##_statistics, (field), (val));\
@@ -129,27 +131,27 @@ extern struct ctl_path net_ipv6_ctl_path[]; 
/* MIBs */

DECLARE_SNMP_STAT(struct ipstats_mib, ipv6_statistics);



#define IP6_INC_STATS(net, idev,field)	({ (void)(net); \

		_DEVINC(ipv6, , idev, field); })

#define IP6_INC_STATS_BH(net, idev,field) ({ (void)(net); \

		_DEVINC(ipv6, _BH, idev, field); })

#define IP6_ADD_STATS_BH(net, idev,field,val) ({ (void)(net); \

		_DEVADD(ipv6, _BH, idev, field, val); })

#define IP6_INC_STATS(net, idev,field)		\

		_DEVINC(net, ipv6, , idev, field)

#define IP6_INC_STATS_BH(net, idev,field)	\

		_DEVINC(net, ipv6, _BH, idev, field)

#define IP6_ADD_STATS_BH(net, idev,field,val)	\

		_DEVADD(net, ipv6, _BH, idev, field, val)



DECLARE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);

DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);



#define ICMP6_INC_STATS(net, idev, field)	({ (void)(net); \

		_DEVINC(icmpv6, , idev, field); })

#define ICMP6_INC_STATS_BH(net, idev, field)	({ (void)(net); \

		_DEVINC(icmpv6, _BH, idev, field); })



#define ICMP6MSGOUT_INC_STATS(net, idev, field) ({ (void)(net); \

	_DEVINC(icmpv6msg, , idev, field +256); })

#define ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \

	_DEVINC(icmpv6msg, _BH, idev, field +256); })

#define ICMP6MSGIN_INC_STATS_BH(net, idev, field) ({ (void)(net); \

	_DEVINC(icmpv6msg, _BH, idev, field); })

#define ICMP6_INC_STATS(net, idev, field)	\

		_DEVINC(net, icmpv6, , idev, field)

#define ICMP6_INC_STATS_BH(net, idev, field)	\

		_DEVINC(net, icmpv6, _BH, idev, field)



#define ICMP6MSGOUT_INC_STATS(net, idev, field)		\

	_DEVINC(net, icmpv6msg, , idev, field +256)

#define ICMP6MSGOUT_INC_STATS_BH(net, idev, field)	\

	_DEVINC(net, icmpv6msg, _BH, idev, field +256)

#define ICMP6MSGIN_INC_STATS_BH(net, idev, field)	\

	_DEVINC(net, icmpv6msg, _BH, idev, field)



struct ip6_ra_chain

{