 @@ -1,14 +1,14 @@
-/*	$NetBSD: bpf.c,v 1.205 2017/01/24 09:05:28 ozaki-r Exp $	*/
+/*	$NetBSD: bpf.c,v 1.206 2017/01/25 01:04:23 ozaki-r Exp $	*/
 /*
  * Copyright (c) 1990, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from the Stanford/CMU enet packet filter,
  * (net/enet.c) distributed as part of 4.3BSD, and code contributed
  * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
  * Berkeley Laboratory.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * 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.
+ *
  *	@(#)bpf.c	8.4 (Berkeley) 1/9/95
  * static char rcsid[] =
  * "Header: bpf.c,v 1.67 96/09/26 22:00:52 leres Exp ";
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.205 2017/01/24 09:05:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.206 2017/01/25 01:04:23 ozaki-r Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_bpf.h"
 #include "sl.h"
 #include "strip.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/time.h>
 @@ -1656,35 +1656,36 @@ bpf_mtap_si(void *arg)
 		    __func__, m, bp->bif_ifp->if_xname);
 #endif
 #ifndef NET_MPSAFE
 		KERNEL_LOCK(1, NULL);
 #endif
 		bpf_ops->bpf_mtap(bp, m);
 #ifndef NET_MPSAFE
 		KERNEL_UNLOCK_ONE(NULL);
 #endif
 		m_freem(m);
+	}
+}
-void
+static void
-bpf_mtap_softint(struct ifnet *ifp, struct mbuf *m)
+_bpf_mtap_softint(struct ifnet *ifp, struct mbuf *m)
+{
 	struct bpf_if *bp = ifp->if_bpf;
 	struct mbuf *dup;
 	KASSERT(cpu_intr_p());
-	if (bp == NULL || bp->bif_dlist == NULL)
+	/* To avoid extra invocations of the softint */
 	if (bp->bif_dlist == NULL)
 		return;
 	KASSERT(bp->bif_si != NULL);
 	dup = bpf_mbuf_enqueue(bp, m);
 	if (dup != NULL)
 		softint_schedule(bp->bif_si);
+}
 static int
 bpf_hdrlen(struct bpf_d *d)
+{
 	int hdrlen = d->bd_bif->bif_hdrlen;
 	/*
 @@ -1883,28 +1884,28 @@ _bpfattach(struct ifnet *ifp, u_int dlt,
 	bp->bif_next = bpf_iflist;
 	bpf_iflist = bp;
 	*bp->bif_driverp = NULL;
 	bp->bif_hdrlen = hdrlen;
 	mutex_exit(&bpf_mtx);
 #if 0
 	printf("bpf: %s attached\n", ifp->if_xname);
 #endif
+}
-void
+static void
-bpf_mtap_softint_init(struct ifnet *ifp)
+_bpf_mtap_softint_init(struct ifnet *ifp)
+{
 	struct bpf_if *bp;
 	mutex_enter(&bpf_mtx);
 	for (bp = bpf_iflist; bp != NULL; bp = bp->bif_next) {
 		if (bp->bif_ifp != ifp)
 			continue;
 		bp->bif_mbuf_head = NULL;
 		bp->bif_mbuf_tail = NULL;
 		bp->bif_si = softint_establish(SOFTINT_NET, bpf_mtap_si, bp);
 		if (bp->bif_si == NULL)
 			panic("%s: softint_establish() failed", __func__);
 @@ -2217,26 +2218,29 @@ sysctl_net_bpf_setup(void)
+}
 struct bpf_ops bpf_ops_kernel = {
 	.bpf_attach =		_bpfattach,
 	.bpf_detach =		_bpfdetach,
 	.bpf_change_type =	_bpf_change_type,
 	.bpf_tap =		_bpf_tap,
 	.bpf_mtap =		_bpf_mtap,
 	.bpf_mtap2 =		_bpf_mtap2,
 	.bpf_mtap_af =		_bpf_mtap_af,
 	.bpf_mtap_sl_in =	_bpf_mtap_sl_in,
 	.bpf_mtap_sl_out =	_bpf_mtap_sl_out,
 	.bpf_mtap_softint =		_bpf_mtap_softint,
 	.bpf_mtap_softint_init =	_bpf_mtap_softint_init,
 };
 MODULE(MODULE_CLASS_DRIVER, bpf, "bpf_filter");
 static int
 bpf_modcmd(modcmd_t cmd, void *arg)
+{
 #ifdef _MODULE
 	devmajor_t bmajor, cmajor;
 #endif
 	int error = 0;
 	switch (cmd) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bpf.h,v 1.68 2017/01/24 09:05:28 ozaki-r Exp $	*/
+/*	$NetBSD: bpf.h,v 1.69 2017/01/25 01:04:23 ozaki-r Exp $	*/
 /*
  * Copyright (c) 1990, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from the Stanford/CMU enet packet filter,
  * (net/enet.c) distributed as part of 4.3BSD, and code contributed
  * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
  * Berkeley Laboratory.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -413,26 +413,29 @@ struct bpf_ctx {
 struct bpf_if;
 struct bpf_ops {
 	void (*bpf_attach)(struct ifnet *, u_int, u_int, struct bpf_if **);
 	void (*bpf_detach)(struct ifnet *);
 	void (*bpf_change_type)(struct ifnet *, u_int, u_int);
 	void (*bpf_tap)(struct bpf_if *, u_char *, u_int);
 	void (*bpf_mtap)(struct bpf_if *, struct mbuf *);
 	void (*bpf_mtap2)(struct bpf_if *, void *, u_int, struct mbuf *);
 	void (*bpf_mtap_af)(struct bpf_if *, uint32_t, struct mbuf *);
 	void (*bpf_mtap_sl_in)(struct bpf_if *, u_char *, struct mbuf **);
 	void (*bpf_mtap_sl_out)(struct bpf_if *, u_char *, struct mbuf *);
 	void (*bpf_mtap_softint_init)(struct ifnet *);
 	void (*bpf_mtap_softint)(struct ifnet *, struct mbuf *);
 };
 extern struct bpf_ops *bpf_ops;
 static inline void
 bpf_attach(struct ifnet *_ifp, u_int _dlt, u_int _hdrlen)
+{
 	bpf_ops->bpf_attach(_ifp, _dlt, _hdrlen, &_ifp->if_bpf);
+}
 static inline void
 bpf_attach2(struct ifnet *_ifp, u_int _dlt, u_int _hdrlen, struct bpf_if **_dp)
+{
 @@ -488,43 +491,54 @@ bpf_detach(struct ifnet *_ifp)
 static inline void
 bpf_mtap_sl_in(struct ifnet *_ifp, u_char *_hdr, struct mbuf **_m)
+{
 	bpf_ops->bpf_mtap_sl_in(_ifp->if_bpf, _hdr, _m);
+}
 static inline void
 bpf_mtap_sl_out(struct ifnet *_ifp, u_char *_hdr, struct mbuf *_m)
+{
 	if (_ifp->if_bpf)
 		bpf_ops->bpf_mtap_sl_out(_ifp->if_bpf, _hdr, _m);
+}
 static inline void
 bpf_mtap_softint_init(struct ifnet *_ifp)
+{
 	bpf_ops->bpf_mtap_softint_init(_ifp);
+}
 static inline void
 bpf_mtap_softint(struct ifnet *_ifp, struct mbuf *_m)
+{
 	if (_ifp->if_bpf)
 		bpf_ops->bpf_mtap_softint(_ifp, _m);
+}
 void	bpf_setops(void);
 void	bpf_ops_handover_enter(struct bpf_ops *);
 void	bpf_ops_handover_exit(void);
 void	bpfilterattach(int);
 bpf_ctx_t *bpf_create(void);
 void	bpf_destroy(bpf_ctx_t *);
 int	bpf_set_cop(bpf_ctx_t *, const bpf_copfunc_t *, size_t);
 int	bpf_set_extmem(bpf_ctx_t *, size_t, bpf_memword_init_t);
 u_int	bpf_filter_ext(const bpf_ctx_t *, const struct bpf_insn *, bpf_args_t *);
 int	bpf_validate_ext(const bpf_ctx_t *, const struct bpf_insn *, int);
 bpfjit_func_t bpf_jit_generate(bpf_ctx_t *, void *, size_t);
 void	bpf_jit_freecode(bpfjit_func_t);
 void	bpf_mtap_softint_init(struct ifnet *);
 void	bpf_mtap_softint(struct ifnet *, struct mbuf *);
 #endif
 int	bpf_validate(const struct bpf_insn *, int);
 u_int	bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
 __END_DECLS
 #endif /* !_NET_BPF_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bpf_stub.c,v 1.6 2012/01/30 23:31:27 matt Exp $	*/
+/*	$NetBSD: bpf_stub.c,v 1.7 2017/01/25 01:04:23 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2010 The NetBSD Foundation, 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: bpf_stub.c,v 1.6 2012/01/30 23:31:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf_stub.c,v 1.7 2017/01/25 01:04:23 ozaki-r Exp $");
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <net/bpf.h>
 struct laglist {
 	struct ifnet *lag_ifp;
 	u_int lag_dlt;
 	u_int lag_hlen;
 	struct bpf_if **lag_drvp;
 @@ -57,26 +57,29 @@ static kcondvar_t handovercv;
 static bool handover;
 struct bpf_ops bpf_ops_stub = {
 	.bpf_attach =		bpf_stub_attach,
 	.bpf_detach =		bpf_stub_detach,
 	.bpf_change_type =	(void *)bpf_stub_null,
 	.bpf_tap = 		(void *)bpf_stub_warn,
 	.bpf_mtap = 		(void *)bpf_stub_warn,
 	.bpf_mtap2 = 		(void *)bpf_stub_warn,
 	.bpf_mtap_af = 		(void *)bpf_stub_warn,
 	.bpf_mtap_sl_in = 	(void *)bpf_stub_warn,
 	.bpf_mtap_sl_out =	(void *)bpf_stub_warn,
 	.bpf_mtap_softint_init =	(void *)bpf_stub_null,
 	.bpf_mtap_softint =		(void *)bpf_stub_warn,
 };
 struct bpf_ops *bpf_ops;
 static void
 bpf_stub_attach(struct ifnet *ifp, u_int dlt, u_int hlen, struct bpf_if **drvp)
+{
 	struct laglist *lag;
 	bool storeattach = true;
 	lag = kmem_alloc(sizeof(*lag), KM_SLEEP);
 	lag->lag_ifp = ifp;
 	lag->lag_dlt = dlt;
 	lag->lag_hlen = hlen;