 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_pflog.c,v 1.21 2018/06/26 06:48:02 msaitoh Exp $	*/
+/*	$NetBSD: if_pflog.c,v 1.22 2020/01/29 05:52:27 thorpej Exp $	*/
 /*	$OpenBSD: if_pflog.c,v 1.24 2007/05/26 17:13:30 jason Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
  * Niels Provos (provos@physnet.uni-hamburg.de).
+ *
  * This code was written by John Ioannidis for BSD/OS in Athens, Greece,
  * in November 1995.
+ *
  * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
  * by Angelos D. Keromytis.
+ *
 @@ -26,27 +26,27 @@
  * You may use this code under the GNU public license if you so wish. Please
  * contribute changes back to the authors under this freer than GPL license
  * so that we may further the use of strong encryption without limitations to
  * all.
+ *
  * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
  * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
  * PURPOSE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v 1.21 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v 1.22 2020/01/29 05:52:27 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include "pflog.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 @@ -284,26 +284,30 @@ pflog_packet(struct pfi_kif *kif, struct
 	hdr.rule_pid = rm->cpid;
 	hdr.dir = dir;
 #ifdef INET
 	if (af == AF_INET && dir == PF_OUT) {
 		struct ip *ip;
 		ip = mtod(m, struct ip *);
 		ip->ip_sum = 0;
 		ip->ip_sum = in_cksum(m, ip->ip_hl << 2);
+	}
 #endif /* INET */
 #ifdef __NetBSD__
 	if_statadd2(ifn, if_opackets, 1, if_obytes, m->m_pkthdr.len);
 #else
 	ifn->if_opackets++;
 	ifn->if_obytes += m->m_pkthdr.len;
 #endif /* __NetBSD__ */
 #ifdef __NetBSD__
 	bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m, BPF_D_OUT);
 #else
 	bpf_mtap_hdr(ifn->if_bpf, (char *)&hdr, PFLOG_HDRLEN, m,
 	    BPF_DIRECTION_OUT);
 #endif /* !__NetBSD__ */
 	return (0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_pfsync.c,v 1.19 2018/12/22 14:28:56 maxv Exp $	*/
+/*	$NetBSD: if_pfsync.c,v 1.20 2020/01/29 05:52:27 thorpej Exp $	*/
 /*	$OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $	*/
 /*
  * Copyright (c) 2002 Michael Shalayeff
  * 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
 @@ -18,27 +18,27 @@
  * 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 AUTHOR OR HIS RELATIVES 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.19 2018/12/22 14:28:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.20 2020/01/29 05:52:27 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 @@ -1035,27 +1035,31 @@ pfsync_setmtu(struct pfsync_softc *sc, i
 	sc->sc_if.if_mtu = sizeof(struct pfsync_header) +
 	    sc->sc_maxcount * sizeof(struct pfsync_state);
+}
 struct mbuf *
 pfsync_get_mbuf(struct pfsync_softc *sc, u_int8_t action, void **sp)
+{
 	struct pfsync_header *h;
 	struct mbuf *m;
 	int len;
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 #ifdef __NetBSD__
 		if_statinc(&sc->sc_if, if_oerrors);
 #else
 		sc->sc_if.if_oerrors++;
 #endif /* __NetBSD__ */
 		return (NULL);
+	}
 	switch (action) {
 	case PFSYNC_ACT_CLR:
 		len = sizeof(struct pfsync_header) +
 		    sizeof(struct pfsync_state_clr);
 		break;
 	case PFSYNC_ACT_UPD_C:
 		len = (sc->sc_maxcount * sizeof(struct pfsync_state_upd)) +
 		    sizeof(struct pfsync_header);
 		break;
 	case PFSYNC_ACT_DEL_C:
 @@ -1074,27 +1078,31 @@ pfsync_get_mbuf(struct pfsync_softc *sc,
 		len = (sc->sc_maxcount * sizeof(struct pfsync_tdb)) +
 		    sizeof(struct pfsync_header);
 		break;
 	default:
 		len = (sc->sc_maxcount * sizeof(struct pfsync_state)) +
 		    sizeof(struct pfsync_header);
 		break;
+	}
 	if (len > MHLEN) {
 		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 #ifdef __NetBSD__
 			if_statinc(&sc->sc_if, if_oerrors);
 #else
 			sc->sc_if.if_oerrors++;
 #endif /* __NetBSD__ */
 			return (NULL);
+		}
 		m->m_data += (MCLBYTES - len) &~ (sizeof(long) - 1);
 	} else
 		m_align(m, len);
 	m_reset_rcvif(m);
 	m->m_pkthdr.len = m->m_len = sizeof(struct pfsync_header);
 	h = mtod(m, struct pfsync_header *);
 	h->version = PFSYNC_VERSION;
 	h->af = 0;
 	h->count = 0;
 	h->action = action;