 @@ -1,14 +1,14 @@
-/*	$NetBSD: in_l2tp.c,v 1.17 2019/09/19 06:07:25 knakahara Exp $	*/
+/*	$NetBSD: in_l2tp.c,v 1.18 2020/01/29 04:37:24 thorpej Exp $	*/
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.17 2019/09/19 06:07:25 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.18 2020/01/29 04:37:24 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 @@ -229,27 +229,27 @@ in_l2tp_output(struct l2tp_variant *var,
 	/*
 	 * To avoid inappropriate rewrite of checksum,
 	 * clear csum flags.
 	 */
 	m->m_pkthdr.csum_flags  = 0;
 	error = ip_output(m, NULL, ro_pc, 0, NULL, NULL);
 	if_tunnel_put_ro(sc->l2tp_ro_percpu, lock_pc);
 	return error;
 looped:
 	if (error)
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 out:
 	return error;
+}
 static void
 in_l2tp_input(struct mbuf *m, int off, int proto, void *eparg __unused)
+{
 	struct ifnet *l2tpp = NULL;
 	struct l2tp_softc *sc;
 	uint32_t sess_id;
 	uint32_t cookie_32;
 	uint64_t cookie_64;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_carp.c,v 1.107 2020/01/20 18:38:22 thorpej Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.108 2020/01/29 04:37:24 thorpej Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
  * Copyright (c) 2003 Ryan McBride. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -23,27 +23,27 @@
  * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_mbuftrace.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.107 2020/01/20 18:38:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.108 2020/01/29 04:37:24 thorpej Exp $");
 /*
  * TODO:
  *	- iface reconfigure
  *	- support for hardware checksum calculations;
+ *
  */
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -702,50 +702,49 @@ carp_proto_input_c(struct mbuf *m, struc
 			if (IN6_IS_ADDR_LINKLOCAL(&in6_found))
 				in6_found.s6_addr16[1] = 0;
 			if (IN6_ARE_ADDR_EQUAL(&in6_src, &in6_found)) {
 				pserialize_read_exit(s);
 				m_freem(m);
 				return;
+			}
+		}
 #endif /* INET6 */
 		pserialize_read_exit(s);
+	}
 	nanotime(&sc->sc_if.if_lastchange);
-	sc->sc_if.if_ipackets++;
+	if_statadd2(&sc->sc_if, if_ipackets, 1, if_ibytes, m->m_pkthdr.len);
 	sc->sc_if.if_ibytes += m->m_pkthdr.len;
 	/* verify the CARP version. */
 	if (ch->carp_version != CARP_VERSION) {
 		CARP_STATINC(CARP_STAT_BADVER);
-		sc->sc_if.if_ierrors++;
+		if_statinc(&sc->sc_if, if_ierrors);
 		CARP_LOG(sc, ("invalid version %d != %d",
 		    ch->carp_version, CARP_VERSION));
 		m_freem(m);
 		return;
+	}
 	/* verify the hash */
 	if (carp_hmac_verify(sc, ch->carp_counter, ch->carp_md)) {
 		struct ip *ip;
 		char ipbuf[INET_ADDRSTRLEN];
 #ifdef INET6
 		struct ip6_hdr *ip6;
 		char ip6buf[INET6_ADDRSTRLEN];
 #endif
 		CARP_STATINC(CARP_STAT_BADAUTH);
-		sc->sc_if.if_ierrors++;
+		if_statinc(&sc->sc_if, if_ierrors);
 		switch(af) {
 		case AF_INET:
 			ip = mtod(m, struct ip *);
 			CARP_LOG(sc, ("incorrect hash from %s",
 			    IN_PRINT(ipbuf, &ip->ip_src)));
 			break;
 #ifdef INET6
 		case AF_INET6:
 			ip6 = mtod(m, struct ip6_hdr *);
 			CARP_LOG(sc, ("incorrect hash from %s",
 			    IN6_PRINT(ip6buf, &ip6->ip6_src)));
 @@ -1028,27 +1027,27 @@ carp_send_ad(void *v)
 	struct carp_header ch;
 	struct timeval tv;
 	struct carp_softc *sc = v;
 	struct carp_header *ch_ptr;
 	struct mbuf *m;
 	int error, len, advbase, advskew, s;
 	struct sockaddr sa;
 	KERNEL_LOCK(1, NULL);
 	s = splsoftnet();
 	advbase = advskew = 0; /* Sssssh compiler */
 	if (sc->sc_carpdev == NULL) {
-		sc->sc_if.if_oerrors++;
+		if_statinc(&sc->sc_if, if_oerrors);
 		goto retry_later;
+	}
 	/* bow out if we've gone to backup (the carp interface is going down) */
 	if (sc->sc_bow_out) {
 		sc->sc_bow_out = 0;
 		advbase = 255;
 		advskew = 255;
 	} else {
 		advbase = sc->sc_advbase;
 		if (!carp_suppress_preempt || sc->sc_advskew > 240)
 			advskew = sc->sc_advskew;
 		else
 @@ -1065,27 +1064,27 @@ carp_send_ad(void *v)
 	ch.carp_authlen = 7;	/* XXX DEFINE */
 	ch.carp_pad1 = 0;	/* must be zero */
 	ch.carp_cksum = 0;
 #ifdef INET
 	if (sc->sc_naddrs) {
 		struct ip *ip;
 		struct ifaddr *ifa;
 		int _s;
 		MGETHDR(m, M_DONTWAIT, MT_HEADER);
 		if (m == NULL) {
-			sc->sc_if.if_oerrors++;
+			if_statinc(&sc->sc_if, if_oerrors);
 			CARP_STATINC(CARP_STAT_ONOMEM);
 			/* XXX maybe less ? */
 			goto retry_later;
+		}
 		MCLAIM(m, &carp_proto_mowner_tx);
 		len = sizeof(*ip) + sizeof(ch);
 		m->m_pkthdr.len = len;
 		m_reset_rcvif(m);
 		m->m_len = len;
 		m_align(m, m->m_len);
 		m->m_flags |= M_MCAST;
 		ip = mtod(m, struct ip *);
 		ip->ip_v = IPVERSION;
 @@ -1109,38 +1108,37 @@ carp_send_ad(void *v)
 			    ifatoia(ifa)->ia_addr.sin_addr.s_addr;
 		pserialize_read_exit(_s);
 		ip->ip_dst.s_addr = INADDR_CARP_GROUP;
 		ch_ptr = (struct carp_header *)(&ip[1]);
 		memcpy(ch_ptr, &ch, sizeof(ch));
 		carp_prepare_ad(m, sc, ch_ptr);
 		m->m_data += sizeof(*ip);
 		ch_ptr->carp_cksum = carp_cksum(m, len - sizeof(*ip));
 		m->m_data -= sizeof(*ip);
 		nanotime(&sc->sc_if.if_lastchange);
-		sc->sc_if.if_opackets++;
+		if_statadd2(&sc->sc_if, if_opackets, 1, if_obytes, len);
 		sc->sc_if.if_obytes += len;
 		CARP_STATINC(CARP_STAT_OPACKETS);
 		error = ip_output(m, NULL, NULL, IP_RAWOUTPUT, &sc->sc_imo,
 		    NULL);
 		if (error) {
 			if (error == ENOBUFS)
 				CARP_STATINC(CARP_STAT_ONOMEM);
 			else
 				CARP_LOG(sc, ("ip_output failed: %d", error));
-			sc->sc_if.if_oerrors++;
+			if_statinc(&sc->sc_if, if_oerrors);
 			if (sc->sc_sendad_errors < INT_MAX)
 				sc->sc_sendad_errors++;
 			if (sc->sc_sendad_errors == CARP_SENDAD_MAX_ERRORS) {
 				carp_suppress_preempt++;
 				if (carp_suppress_preempt == 1)
 					carp_send_ad_all();
+			}
 			sc->sc_sendad_success = 0;
 		} else {
 			if (sc->sc_sendad_errors >= CARP_SENDAD_MAX_ERRORS) {
 				if (++sc->sc_sendad_success >=
 				    CARP_SENDAD_MIN_SUCCESS) {
 					carp_suppress_preempt--;
 @@ -1149,27 +1147,27 @@ carp_send_ad(void *v)
 			} else
 				sc->sc_sendad_errors = 0;
+		}
+	}
 #endif /* INET */
 #ifdef INET6
 	if (sc->sc_naddrs6) {
 		struct ip6_hdr *ip6;
 		struct ifaddr *ifa;
 		int _s;
 		MGETHDR(m, M_DONTWAIT, MT_HEADER);
 		if (m == NULL) {
-			sc->sc_if.if_oerrors++;
+			if_statinc(&sc->sc_if, if_oerrors);
 			CARP_STATINC(CARP_STAT_ONOMEM);
 			/* XXX maybe less ? */
 			goto retry_later;
+		}
 		MCLAIM(m, &carp_proto6_mowner_tx);
 		len = sizeof(*ip6) + sizeof(ch);
 		m->m_pkthdr.len = len;
 		m_reset_rcvif(m);
 		m->m_len = len;
 		m_align(m, m->m_len);
 		m->m_flags |= M_MCAST;
 		ip6 = mtod(m, struct ip6_hdr *);
 		memset(ip6, 0, sizeof(*ip6));
 @@ -1183,51 +1181,50 @@ carp_send_ad(void *v)
 		_s = pserialize_read_enter();
 		ifa = ifaof_ifpforaddr(&sa, sc->sc_carpdev);
 		if (ifa == NULL)	/* This should never happen with IPv6 */
 			memset(&ip6->ip6_src, 0, sizeof(struct in6_addr));
 		else
 			bcopy(ifatoia6(ifa)->ia_addr.sin6_addr.s6_addr,
 			    &ip6->ip6_src, sizeof(struct in6_addr));
 		pserialize_read_exit(_s);
 		/* set the multicast destination */
 		ip6->ip6_dst.s6_addr16[0] = htons(0xff02);
 		ip6->ip6_dst.s6_addr8[15] = 0x12;
 		if (in6_setscope(&ip6->ip6_dst, &sc->sc_if, NULL) != 0) {
-			sc->sc_if.if_oerrors++;
+			if_statinc(&sc->sc_if, if_oerrors);
 			m_freem(m);
 			CARP_LOG(sc, ("in6_setscope failed"));
 			goto retry_later;
+		}
 		ch_ptr = (struct carp_header *)(&ip6[1]);
 		memcpy(ch_ptr, &ch, sizeof(ch));
 		carp_prepare_ad(m, sc, ch_ptr);
 		ch_ptr->carp_cksum = carp6_cksum(m, sizeof(*ip6),
 		    len - sizeof(*ip6));
 		nanotime(&sc->sc_if.if_lastchange);
-		sc->sc_if.if_opackets++;
+		if_statadd2(&sc->sc_if, if_opackets, 1, if_obytes, len);
 		sc->sc_if.if_obytes += len;
 		CARP_STATINC(CARP_STAT_OPACKETS6);
 		error = ip6_output(m, NULL, NULL, 0, &sc->sc_im6o, NULL, NULL);
 		if (error) {
 			if (error == ENOBUFS)
 				CARP_STATINC(CARP_STAT_ONOMEM);
 			else
 				CARP_LOG(sc, ("ip6_output failed: %d", error));
-			sc->sc_if.if_oerrors++;
+			if_statinc(&sc->sc_if, if_oerrors);
 			if (sc->sc_sendad_errors < INT_MAX)
 				sc->sc_sendad_errors++;
 			if (sc->sc_sendad_errors == CARP_SENDAD_MAX_ERRORS) {
 				carp_suppress_preempt++;
 				if (carp_suppress_preempt == 1)
 					carp_send_ad_all();
+			}
 			sc->sc_sendad_success = 0;
 		} else {
 			if (sc->sc_sendad_errors >= CARP_SENDAD_MAX_ERRORS) {
 				if (++sc->sc_sendad_success >=
 				    CARP_SENDAD_MIN_SUCCESS) {
 					carp_suppress_preempt--;
 @@ -1499,27 +1496,27 @@ carp_input(struct mbuf *m, u_int8_t *sho
 			ether_input(&vh->sc_if, m0);
+		}
 		return (1);
+	}
 	ifp = carp_ourether(cif, &eh, m_get_rcvif_NOMPSAFE(m)->if_type, 0);
 	if (ifp == NULL) {
 		return (1);
+	}
 	m_set_rcvif(m, ifp);
 	bpf_mtap(ifp, m, BPF_D_IN);
-	ifp->if_ipackets++;
+	if_statinc(ifp, if_ipackets);
 	ether_input(ifp, m);
 	return (0);
+}
 static void
 carp_master_down(void *v)
+{
 	struct carp_softc *sc = v;
 	switch (sc->sc_state) {
 	case INIT:
 		printf("%s: master_down event in INIT state\n",
 		    sc->sc_if.if_xname);