 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_vlan.c,v 1.159 2021/07/14 06:50:22 yamaguchi Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.160 2021/07/15 04:05:47 yamaguchi Exp $	*/
 /*
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran, and by Jason R. Thorpe of Zembu Labs, Inc.
+ *
  * 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.
 @@ -68,27 +68,27 @@
  * enough of an Ethernet implementation to make ARP work.  The way we do
  * this is by telling everyone that we are an Ethernet interface, and then
  * catch the packets that ether_output() left on our output queue when it
  * calls if_start(), rewrite them for use by the real outgoing interface,
  * and ask it to send them.
+ *
  * TODO:
+ *
  *	- Need some way to notify vlan interfaces when the parent
  *	  interface changes MTU.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.159 2021/07/14 06:50:22 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.160 2021/07/15 04:05:47 yamaguchi Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 @@ -1311,47 +1311,63 @@ vlan_ether_purgemulti(struct ifvlan *ifv
 		free(mc, M_DEVBUF);
+	}
+}
 static void
 vlan_start(struct ifnet *ifp)
+{
 	struct ifvlan *ifv = ifp->if_softc;
 	struct ifnet *p;
 	struct ethercom *ec;
 	struct mbuf *m;
 	struct ifvlan_linkmib *mib;
 	struct psref psref;
 	struct ether_header *eh;
 	int error;
 	mib = vlan_getref_linkmib(ifv, &psref);
 	if (mib == NULL)
 		return;
 	if (__predict_false(mib->ifvm_p == NULL)) {
 		vlan_putref_linkmib(mib, &psref);
 		return;
+	}
 	p = mib->ifvm_p;
 	ec = (void *)mib->ifvm_p;
 	ifp->if_flags |= IFF_OACTIVE;
 	for (;;) {
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		if (m == NULL)
 			break;
 		if (m->m_len < sizeof(*eh)) {
 			m = m_pullup(m, sizeof(*eh));
 			if (m == NULL) {
 				if_statinc(ifp, if_oerrors);
 				continue;
+			}
+		}
 		eh = mtod(m, struct ether_header *);
 		if (ntohs(eh->ether_type) == ETHERTYPE_VLAN) {
 			m_freem(m);
 			if_statinc(ifp, if_noproto);
 			continue;
+		}
 #ifdef ALTQ
 		/*
 		 * KERNEL_LOCK is required for ALTQ even if NET_MPSAFE is
 		 * defined.
 		 */
 		KERNEL_LOCK(1, NULL);
 		/*
 		 * If ALTQ is enabled on the parent interface, do
 		 * classification; the queueing discipline might
 		 * not require classification, but might require
 		 * the address family/header pointer in the pktattr.
 		 */
 		if (ALTQ_IS_ENABLED(&p->if_snd)) {
 @@ -1455,30 +1471,46 @@ vlan_start(struct ifnet *ifp)
 	/* Remove reference to mib before release */
 	vlan_putref_linkmib(mib, &psref);
+}
 static int
 vlan_transmit(struct ifnet *ifp, struct mbuf *m)
+{
 	struct ifvlan *ifv = ifp->if_softc;
 	struct ifnet *p;
 	struct ethercom *ec;
 	struct ifvlan_linkmib *mib;
 	struct psref psref;
 	struct ether_header *eh;
 	int error;
 	size_t pktlen = m->m_pkthdr.len;
 	bool mcast = (m->m_flags & M_MCAST) != 0;
 	if (m->m_len < sizeof(*eh)) {
 		m = m_pullup(m, sizeof(*eh));
 		if (m == NULL) {
 			if_statinc(ifp, if_oerrors);
 			return ENOBUFS;
+		}
+	}
 	eh = mtod(m, struct ether_header *);
 	if (ntohs(eh->ether_type) == ETHERTYPE_VLAN) {
 		m_freem(m);
 		if_statinc(ifp, if_noproto);
 		return EPROTONOSUPPORT;
+	}
 	mib = vlan_getref_linkmib(ifv, &psref);
 	if (mib == NULL) {
 		m_freem(m);
 		return ENETDOWN;
+	}
 	if (__predict_false(mib->ifvm_p == NULL)) {
 		vlan_putref_linkmib(mib, &psref);
 		m_freem(m);
 		return ENETDOWN;
+	}
 	p = mib->ifvm_p;