svn commit: r252007 - head/sys/netinet6
Andrey V. Elsukov
ae at FreeBSD.org
Wed Jun 19 20:48:35 UTC 2013
Author: ae
Date: Wed Jun 19 20:48:34 2013
New Revision: 252007
URL: http://svnweb.freebsd.org/changeset/base/252007
Log:
Use RIP6STAT_INC() macro for raw ip6 statistics accounting.
MFC after: 2 weeks
Modified:
head/sys/netinet6/raw_ip6.c
head/sys/netinet6/raw_ip6.h
Modified: head/sys/netinet6/raw_ip6.c
==============================================================================
--- head/sys/netinet6/raw_ip6.c Wed Jun 19 20:37:13 2013 (r252006)
+++ head/sys/netinet6/raw_ip6.c Wed Jun 19 20:48:34 2013 (r252007)
@@ -160,7 +160,7 @@ rip6_input(struct mbuf **mp, int *offp,
struct mbuf *opts = NULL;
struct sockaddr_in6 fromsa;
- V_rip6stat.rip6s_ipackets++;
+ RIP6STAT_INC(rip6s_ipackets);
if (faithprefix_p != NULL && (*faithprefix_p)(&ip6->ip6_dst)) {
/* XXX Send icmp6 host/port unreach? */
@@ -199,11 +199,11 @@ rip6_input(struct mbuf **mp, int *offp,
}
INP_RLOCK(in6p);
if (in6p->in6p_cksum != -1) {
- V_rip6stat.rip6s_isum++;
+ RIP6STAT_INC(rip6s_isum);
if (in6_cksum(m, proto, *offp,
m->m_pkthdr.len - *offp)) {
INP_RUNLOCK(in6p);
- V_rip6stat.rip6s_badsum++;
+ RIP6STAT_INC(rip6s_badsum);
continue;
}
}
@@ -279,7 +279,7 @@ rip6_input(struct mbuf **mp, int *offp,
m_freem(n);
if (opts)
m_freem(opts);
- V_rip6stat.rip6s_fullsock++;
+ RIP6STAT_INC(rip6s_fullsock);
} else
sorwakeup(last->inp_socket);
opts = NULL;
@@ -312,14 +312,14 @@ rip6_input(struct mbuf **mp, int *offp,
m_freem(m);
if (opts)
m_freem(opts);
- V_rip6stat.rip6s_fullsock++;
+ RIP6STAT_INC(rip6s_fullsock);
} else
sorwakeup(last->inp_socket);
INP_RUNLOCK(last);
} else {
- V_rip6stat.rip6s_nosock++;
+ RIP6STAT_INC(rip6s_nosock);
if (m->m_flags & M_MCAST)
- V_rip6stat.rip6s_nosockmcast++;
+ RIP6STAT_INC(rip6s_nosockmcast);
if (proto == IPPROTO_NONE)
m_freem(m);
else {
@@ -559,7 +559,7 @@ rip6_output(m, va_alist)
icmp6_ifoutstat_inc(oifp, type, code);
ICMP6STAT_INC(icp6s_outhist[type]);
} else
- V_rip6stat.rip6s_opackets++;
+ RIP6STAT_INC(rip6s_opackets);
goto freectl;
Modified: head/sys/netinet6/raw_ip6.h
==============================================================================
--- head/sys/netinet6/raw_ip6.h Wed Jun 19 20:37:13 2013 (r252006)
+++ head/sys/netinet6/raw_ip6.h Wed Jun 19 20:48:34 2013 (r252007)
@@ -48,6 +48,8 @@ struct rip6stat {
};
#ifdef _KERNEL
+#define RIP6STAT_ADD(name, val) V_rip6stat.name += (val)
+#define RIP6STAT_INC(name) RIP6STAT_ADD(name, 1)
VNET_DECLARE(struct rip6stat, rip6stat);
#define V_rip6stat VNET(rip6stat)
#endif
More information about the svn-src-all
mailing list