 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.c,v 1.199 2019/07/30 08:44:28 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.199.2.1 2019/09/01 11:07:05 martin Exp $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -209,26 +209,27 @@ static void	ixgbe_disable_rx_drop(struct
 static void	ixgbe_initialize_rss_mapping(struct adapter *);
 static void	ixgbe_enable_intr(struct adapter *);
 static void	ixgbe_disable_intr(struct adapter *);
 static void	ixgbe_update_stats_counters(struct adapter *);
 static void	ixgbe_set_promisc(struct adapter *);
 static void	ixgbe_set_multi(struct adapter *);
 static void	ixgbe_update_link_status(struct adapter *);
 static void	ixgbe_set_ivar(struct adapter *, u8, u8, s8);
 static void	ixgbe_configure_ivars(struct adapter *);
 static u8 *	ixgbe_mc_array_itr(struct ixgbe_hw *, u8 **, u32 *);
 static void	ixgbe_eitr_write(struct adapter *, uint32_t, uint32_t);
 static void	ixgbe_setup_vlan_hw_tagging(struct adapter *);
 static void	ixgbe_setup_vlan_hw_support(struct adapter *);
 static int	ixgbe_vlan_cb(struct ethercom *, uint16_t, bool);
 static int	ixgbe_register_vlan(void *, struct ifnet *, u16);
 static int	ixgbe_unregister_vlan(void *, struct ifnet *, u16);
 static void	ixgbe_add_device_sysctls(struct adapter *);
 static void	ixgbe_add_hw_stats(struct adapter *);
 static void	ixgbe_clear_evcnt(struct adapter *);
 static int	ixgbe_set_flowcntl(struct adapter *, int);
 static int	ixgbe_set_advertise(struct adapter *, int);
 static int	ixgbe_get_advertise(struct adapter *);
 /* Sysctl handlers */
 @@ -2295,33 +2296,44 @@ ixgbe_sysctl_rdt_handler(SYSCTLFN_ARGS)
 	adapter = rxr->adapter;
 	if (ixgbe_fw_recovery_mode_swflag(adapter))
 		return (EPERM);
 	val = IXGBE_READ_REG(&adapter->hw, IXGBE_RDT(rxr->me));
 	node.sysctl_data = &val;
 	return sysctl_lookup(SYSCTLFN_CALL(&node));
 } /* ixgbe_sysctl_rdt_handler */
 static int
 ixgbe_vlan_cb(struct ethercom *ec, uint16_t vid, bool set)
+{
 	struct ifnet *ifp = &ec->ec_if;
 	struct adapter *adapter = ifp->if_softc;
 	int rv;
 	if (set)
 		rv = ixgbe_register_vlan(ifp->if_softc, ifp, vid);
 	else
 		rv = ixgbe_unregister_vlan(ifp->if_softc, ifp, vid);
 	if (rv != 0)
 		return rv;
 	/*
 	 * Control VLAN HW tagging when ec_nvlan is changed from 1 to 0
 	 * or 0 to 1.
 	 */
 	if ((set && (ec->ec_nvlans == 1)) || (!set && (ec->ec_nvlans == 0)))
 		ixgbe_setup_vlan_hw_tagging(adapter);
 	return rv;
+}
 /************************************************************************
  * ixgbe_register_vlan
+ *
  *   Run via vlan config EVENT, it enables us to use the
  *   HW Filter table since we can get the vlan id. This
  *   just creates the entry in the soft version of the
  *   VFTA, init will repopulate the real table.
  ************************************************************************/
 static int
 ixgbe_register_vlan(void *arg, struct ifnet *ifp, u16 vtag)
 @@ -2371,91 +2383,113 @@ ixgbe_unregister_vlan(void *arg, struct
 	index = (vtag >> 5) & 0x7F;
 	bit = vtag & 0x1F;
 	adapter->shadow_vfta[index] &= ~((u32)1 << bit);
 	error = adapter->hw.mac.ops.set_vfta(&adapter->hw, vtag, 0, false,
 	    true);
 	IXGBE_CORE_UNLOCK(adapter);
 	if (error != 0)
 		error = EACCES;
 	return error;
 } /* ixgbe_unregister_vlan */
 static void
-ixgbe_setup_vlan_hw_support(struct adapter *adapter)
+ixgbe_setup_vlan_hw_tagging(struct adapter *adapter)
+{
 	struct ethercom *ec = &adapter->osdep.ec;
 	struct ixgbe_hw *hw = &adapter->hw;
 	struct rx_ring	*rxr;
 	int		i;
 	u32		ctrl;
-	struct vlanid_list *vlanidp;
+	int		i;
 	bool		hwtagging;
 	/*
 	 *  This function is called from both if_init and ifflags_cb()
 	 * on NetBSD.
 	 */
 	/* Enable HW tagging only if any vlan is attached */
 	hwtagging = (ec->ec_capenable & ETHERCAP_VLAN_HWTAGGING)
 	    && VLAN_ATTACHED(ec);
 	/* Setup the queues for vlans */
 	for (i = 0; i < adapter->num_queues; i++) {
 		rxr = &adapter->rx_rings[i];
 		/*
 		 * On 82599 and later, the VLAN enable is per/queue in RXDCTL.
 		 */
 		if (hw->mac.type != ixgbe_mac_82598EB) {
 			ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me));
 			if (hwtagging)
 				ctrl |= IXGBE_RXDCTL_VME;
 			else
 				ctrl &= ~IXGBE_RXDCTL_VME;
 			IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), ctrl);
+		}
 		rxr->vtag_strip = hwtagging ? TRUE : FALSE;
+	}
 	/* VLAN hw tagging for 82598 */
 	if (hw->mac.type == ixgbe_mac_82598EB) {
 		ctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
 		if (hwtagging)
 			ctrl |= IXGBE_VLNCTRL_VME;
 		else
 			ctrl &= ~IXGBE_VLNCTRL_VME;
 		IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, ctrl);
+	}
 } /* ixgbe_setup_vlan_hw_tagging */
 static void
 ixgbe_setup_vlan_hw_support(struct adapter *adapter)
+{
 	struct ethercom *ec = &adapter->osdep.ec;
 	struct ixgbe_hw *hw = &adapter->hw;
 	int		i;
 	u32		ctrl;
 	struct vlanid_list *vlanidp;
 	/*
 	 *  This function is called from both if_init and ifflags_cb()
 	 * on NetBSD.
 	 */
 	/*
 	 * Part 1:
 	 * Setup VLAN HW tagging
 	 */
 	ixgbe_setup_vlan_hw_tagging(adapter);
 	/*
 	 * Part 2:
 	 * Setup VLAN HW filter
 	 */
 	/* Cleanup shadow_vfta */
 	for (i = 0; i < IXGBE_VFTA_SIZE; i++)
 		adapter->shadow_vfta[i] = 0;
 	/* Generate shadow_vfta from ec_vids */
-	mutex_enter(ec->ec_lock);
+	ETHER_LOCK(ec);
 	SIMPLEQ_FOREACH(vlanidp, &ec->ec_vids, vid_list) {
 		uint32_t idx;
 		idx = vlanidp->vid / 32;
 		KASSERT(idx < IXGBE_VFTA_SIZE);
 		adapter->shadow_vfta[idx] |= (u32)1 << (vlanidp->vid % 32);
+	}
-	mutex_exit(ec->ec_lock);
+	ETHER_UNLOCK(ec);
 	for (i = 0; i < IXGBE_VFTA_SIZE; i++)
 		IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), adapter->shadow_vfta[i]);
 	ctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
 	/* Enable the Filter Table if enabled */
 	if (ec->ec_capenable & ETHERCAP_VLAN_HWFILTER)
 		ctrl |= IXGBE_VLNCTRL_VFE;
 	else
 		ctrl &= ~IXGBE_VLNCTRL_VFE;
 	/* VLAN hw tagging for 82598 */
 	if (hw->mac.type == ixgbe_mac_82598EB) {
 		if (hwtagging)
 			ctrl |= IXGBE_VLNCTRL_VME;
 		else
 			ctrl &= ~IXGBE_VLNCTRL_VME;
 	IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, ctrl);
 } /* ixgbe_setup_vlan_hw_support */
 /************************************************************************
  * ixgbe_get_slot_info
+ *
  *   Get the width and transaction speed of
  *   the slot this adapter is plugged into.
  ************************************************************************/
 static void
 ixgbe_get_slot_info(struct adapter *adapter)
+{
 	device_t		dev = adapter->dev;

 @@ -1,14 +1,14 @@
-/*$NetBSD: ixv.c,v 1.125 2019/07/30 08:38:03 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.125.2.1 2019/09/01 11:07:05 martin Exp $*/
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -110,26 +110,27 @@ static void	ixv_initialize_receive_units
 static void	ixv_initialize_rss_mapping(struct adapter *);
 static s32	ixv_check_link(struct adapter *);
 static void	ixv_enable_intr(struct adapter *);
 static void	ixv_disable_intr(struct adapter *);
 static void	ixv_set_multi(struct adapter *);
 static void	ixv_update_link_status(struct adapter *);
 static int	ixv_sysctl_debug(SYSCTLFN_PROTO);
 static void	ixv_set_ivar(struct adapter *, u8, u8, s8);
 static void	ixv_configure_ivars(struct adapter *);
 static u8 *	ixv_mc_array_itr(struct ixgbe_hw *, u8 **, u32 *);
 static void	ixv_eitr_write(struct adapter *, uint32_t, uint32_t);
 static void	ixv_setup_vlan_tagging(struct adapter *);
 static int	ixv_setup_vlan_support(struct adapter *);
 static int	ixv_vlan_cb(struct ethercom *, uint16_t, bool);
 static int	ixv_register_vlan(void *, struct ifnet *, u16);
 static int	ixv_unregister_vlan(void *, struct ifnet *, u16);
 static void	ixv_add_device_sysctls(struct adapter *);
 static void	ixv_save_stats(struct adapter *);
 static void	ixv_init_stats(struct adapter *);
 static void	ixv_update_stats(struct adapter *);
 static void	ixv_add_stats_sysctls(struct adapter *);
 /* Sysctl handlers */
 static void	ixv_set_sysctl_value(struct adapter *, const char *,
 @@ -1925,83 +1926,100 @@ ixv_sysctl_rdt_handler(SYSCTLFN_ARGS)
+{
 	struct sysctlnode node = *rnode;
 	struct rx_ring *rxr = (struct rx_ring *)node.sysctl_data;
 	uint32_t val;
 	if (!rxr)
 		return (0);
 	val = IXGBE_READ_REG(&rxr->adapter->hw, IXGBE_VFRDT(rxr->me));
 	node.sysctl_data = &val;
 	return sysctl_lookup(SYSCTLFN_CALL(&node));
 } /* ixv_sysctl_rdt_handler */
-/************************************************************************
+static void
- * ixv_setup_vlan_support
+ixv_setup_vlan_tagging(struct adapter *adapter)
  ************************************************************************/
 static int
 ixv_setup_vlan_support(struct adapter *adapter)
+{
 	struct ethercom *ec = &adapter->osdep.ec;
 	struct ixgbe_hw *hw = &adapter->hw;
 	struct rx_ring	*rxr;
-	u32		ctrl, vid, vfta, retry;
+	u32		ctrl;
-	struct vlanid_list *vlanidp;
+	int		i;
 	int rv, error = 0;
 	bool usevlan;
 	bool		hwtagging;
 	/*
 	 *  This function is called from both if_init and ifflags_cb()
 	 * on NetBSD.
 	 */
 	usevlan = VLAN_ATTACHED(ec);
 	/* Enable HW tagging only if any vlan is attached */
 	hwtagging = (ec->ec_capenable & ETHERCAP_VLAN_HWTAGGING)
 	    && VLAN_ATTACHED(ec);
 	/* Enable the queues */
-	for (int i = 0; i < adapter->num_queues; i++) {
+	for (i = 0; i < adapter->num_queues; i++) {
 		rxr = &adapter->rx_rings[i];
 		ctrl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(rxr->me));
 		if (hwtagging)
 			ctrl |= IXGBE_RXDCTL_VME;
 		else
 			ctrl &= ~IXGBE_RXDCTL_VME;
 		IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(rxr->me), ctrl);
 		/*
 		 * Let Rx path know that it needs to store VLAN tag
 		 * as part of extra mbuf info.
 		 */
 		rxr->vtag_strip = hwtagging ? TRUE : FALSE;
+	}
 } /* ixv_setup_vlan_tagging */
 /************************************************************************
  * ixv_setup_vlan_support
  ************************************************************************/
 static int
 ixv_setup_vlan_support(struct adapter *adapter)
+{
 	struct ethercom *ec = &adapter->osdep.ec;
 	struct ixgbe_hw *hw = &adapter->hw;
 	u32		vid, vfta, retry;
 	struct vlanid_list *vlanidp;
 	int rv, error = 0;
 	/*
 	 *  This function is called from both if_init and ifflags_cb()
 	 * on NetBSD.
 	 */
 	/*
 	 * Part 1:
 	 * Setup VLAN HW tagging
 	 */
 	ixv_setup_vlan_tagging(adapter);
-	if (!usevlan)
+	if (!VLAN_ATTACHED(ec))
 		return 0;
 	/*
 	 * Part 2:
 	 * Setup VLAN HW filter
 	 */
 	/* Cleanup shadow_vfta */
 	for (int i = 0; i < IXGBE_VFTA_SIZE; i++)
 		adapter->shadow_vfta[i] = 0;
 	/* Generate shadow_vfta from ec_vids */
-	mutex_enter(ec->ec_lock);
+	ETHER_LOCK(ec);
 	SIMPLEQ_FOREACH(vlanidp, &ec->ec_vids, vid_list) {
 		uint32_t idx;
 		idx = vlanidp->vid / 32;
 		KASSERT(idx < IXGBE_VFTA_SIZE);
 		adapter->shadow_vfta[idx] |= (u32)1 << (vlanidp->vid % 32);
+	}
-	mutex_exit(ec->ec_lock);
+	ETHER_UNLOCK(ec);
 	/*
 	 * A soft reset zero's out the VFTA, so
 	 * we need to repopulate it now.
 	 */
 	for (int i = 0; i < IXGBE_VFTA_SIZE; i++) {
 		if (adapter->shadow_vfta[i] == 0)
 			continue;
 		vfta = adapter->shadow_vfta[i];
 		/*
 		 * Reconstruct the vlan id's
 		 * based on the bits set in each
 		 * of the array ints.
 @@ -2026,33 +2044,44 @@ ixv_setup_vlan_support(struct adapter *a
 				device_printf(adapter->dev,
 				    "failed to set vlan %d\n", vid);
 				error = EACCES;
+			}
+		}
+	}
 	return error;
 } /* ixv_setup_vlan_support */
 static int
 ixv_vlan_cb(struct ethercom *ec, uint16_t vid, bool set)
+{
 	struct ifnet *ifp = &ec->ec_if;
 	struct adapter *adapter = ifp->if_softc;
 	int rv;
 	if (set)
 		rv = ixv_register_vlan(ifp->if_softc, ifp, vid);
 	else
 		rv = ixv_unregister_vlan(ifp->if_softc, ifp, vid);
 	if (rv != 0)
 		return rv;
 	/*
 	 * Control VLAN HW tagging when ec_nvlan is changed from 1 to 0
 	 * or 0 to 1.
 	 */
 	if ((set && (ec->ec_nvlans == 1)) || (!set && (ec->ec_nvlans == 0)))
 		ixv_setup_vlan_tagging(adapter);
 	return rv;
+}
 /************************************************************************
  * ixv_register_vlan
+ *
  *   Run via a vlan config EVENT, it enables us to use the
  *   HW Filter table since we can get the vlan id. This just
  *   creates the entry in the soft version of the VFTA, init
  *   will repopulate the real table.
  ************************************************************************/
 static int
 ixv_register_vlan(void *arg, struct ifnet *ifp, u16 vtag)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_vlan.c,v 1.141 2019/07/17 03:26:24 msaitoh Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.141.2.1 2019/09/01 11:07:06 martin 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.141 2019/07/17 03:26:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.141.2.1 2019/09/01 11:07:06 martin 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>
 @@ -475,54 +475,47 @@ vlan_config(struct ifvlan *ifv, struct i
 				nmib->ifvm_mtufudge = 0;
 			} else {
 				/*
 				 * Fudge the MTU by the encapsulation size. This
 				 * makes us incompatible with strictly compliant
 				 * 802.1Q implementations, but allows us to use
 				 * the feature with other NetBSD
 				 * implementations, which might still be useful.
 				 */
 				nmib->ifvm_mtufudge = nmib->ifvm_encaplen;
+			}
 			error = 0;
+		}
-		/*
+		/* Add a vid to the list */
-		 * Add a vid to the list even if it's not enabled in case
+		vidmem = kmem_alloc(sizeof(struct vlanid_list), KM_SLEEP);
-		 * it's enabled later.
+		vidmem->vid = vid;
-		 */
+		ETHER_LOCK(ec);
-		if (ec->ec_capabilities & ETHERCAP_VLAN_HWFILTER) {
+		SIMPLEQ_INSERT_TAIL(&ec->ec_vids, vidmem, vid_list);
-			vidmem = kmem_alloc(sizeof(struct vlanid_list),
+		ETHER_UNLOCK(ec);
 			    KM_SLEEP);
-			if (vidmem == NULL){
+		if (ec->ec_vlan_cb != NULL) {
 			/*
 			 * Call ec_vlan_cb(). It will setup VLAN HW filter or
 			 * HW tagging function.
 			 */
 			error = (*ec->ec_vlan_cb)(ec, vid, true);
 			if (error) {
 				ec->ec_nvlans--;
-				if (ec->ec_nvlans == 0)
+				if (ec->ec_nvlans == 0) {
 					IFNET_LOCK(p);
 					(void)ether_disable_vlan_mtu(p);
-				error = ENOMEM;
+					IFNET_UNLOCK(p);
 				goto done;
 			vidmem->vid = vid;
 			mutex_enter(ec->ec_lock);
 			SIMPLEQ_INSERT_TAIL(&ec->ec_vids, vidmem, vid_list);
 			mutex_exit(ec->ec_lock);
 		if (ec->ec_capenable & ETHERCAP_VLAN_HWFILTER) {
 			if (ec->ec_vlan_cb != NULL) {
 				error = (*ec->ec_vlan_cb)(ec, vid, true);
 				if (error) {
 					ec->ec_nvlans--;
 					if (ec->ec_nvlans == 0)
 						(void)ether_disable_vlan_mtu(p);
 					goto done;
+				}
 				goto done;
+			}
+		}
 		/*
 		 * If the parent interface can do hardware-assisted
 		 * VLAN encapsulation, then propagate its hardware-
 		 * assisted checksumming flags and tcp segmentation
 		 * offload.
 		 */
 		if (ec->ec_capabilities & ETHERCAP_VLAN_HWTAGGING) {
 			ifp->if_capabilities = p->if_capabilities &
 			    (IFCAP_TSOv4 | IFCAP_TSOv6 |
 				IFCAP_CSUM_IPv4_Tx  | IFCAP_CSUM_IPv4_Rx |
 				IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_TCPv4_Rx |
 @@ -630,40 +623,48 @@ vlan_unconfig_locked(struct ifvlan *ifv,
 	/*
 	 * Since the interface is being unconfigured, we need to empty the
 	 * list of multicast groups that we may have joined while we were
 	 * alive and remove them from the parent's list also.
 	 */
 	(*nmib->ifvm_msw->vmsw_purgemulti)(ifv);
 	/* Disconnect from parent. */
 	switch (p->if_type) {
 	case IFT_ETHER:
+	    {
 		struct ethercom *ec = (void *)p;
-		struct vlanid_list *vlanidp, *tmpp;
+		struct vlanid_list *vlanidp;
 		uint16_t vid = EVL_VLANOFTAG(nmib->ifvm_tag);
-		mutex_enter(ec->ec_lock);
+		ETHER_LOCK(ec);
-		SIMPLEQ_FOREACH_SAFE(vlanidp, &ec->ec_vids, vid_list, tmpp) {
+		SIMPLEQ_FOREACH(vlanidp, &ec->ec_vids, vid_list) {
 			if (vlanidp->vid == vid) {
 				SIMPLEQ_REMOVE(&ec->ec_vids, vlanidp,
 				    vlanid_list, vid_list);
-				kmem_free(vlanidp, sizeof(*vlanidp));
+				break;
+			}
+		}
-		mutex_exit(ec->ec_lock);
+		ETHER_UNLOCK(ec);
-		if (ec->ec_vlan_cb != NULL)
+		if (vlanidp != NULL)
 			kmem_free(vlanidp, sizeof(*vlanidp));
 		if (ec->ec_vlan_cb != NULL) {
 			/*
 			 * Call ec_vlan_cb(). It will setup VLAN HW filter or
 			 * HW tagging function.
 			 */
 			(void)(*ec->ec_vlan_cb)(ec, vid, false);
+		}
 		if (--ec->ec_nvlans == 0) {
 			IFNET_LOCK(p);
 			(void)ether_disable_vlan_mtu(p);
 			IFNET_UNLOCK(p);
+		}
 		/* XXX ether_ifdetach must not be called with IFNET_LOCK */
 		mutex_exit(&ifv->ifv_lock);
 		IFNET_UNLOCK(ifp);
 		ether_ifdetach(ifp);
 		IFNET_LOCK(ifp);
 		mutex_enter(&ifv->ifv_lock);
 @@ -1025,27 +1026,27 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
 			curlwp_bindx(bound);
 			vlan_unconfig(ifp);
 			break;
+		}
 		if (vlr.vlr_tag != EVL_VLANOFTAG(vlr.vlr_tag)) {
 			error = EINVAL;		 /* check for valid tag */
 			break;
+		}
 		if ((pr = ifunit(vlr.vlr_parent)) == NULL) {
 			error = ENOENT;
 			break;
+		}
 		error = vlan_config(ifv, pr, vlr.vlr_tag);
 		if (error != 0)
 			break;
 		/* Update promiscuous mode, if necessary. */
 		vlan_set_promisc(ifp);
 		ifp->if_flags |= IFF_RUNNING;
 		break;
 	case SIOCGETVLAN:
 		memset(&vlr, 0, sizeof(vlr));
 		bound = curlwp_bind();
 @@ -1363,27 +1364,27 @@ vlan_start(struct ifnet *ifp)
 				break;
 			default:
 				panic("%s: impossible (altq)", __func__);
+			}
+		}
 		KERNEL_UNLOCK_ONE(NULL);
 #endif /* ALTQ */
 		bpf_mtap(ifp, m, BPF_D_OUT);
 		/*
 		 * If the parent can insert the tag itself, just mark
 		 * the tag in the mbuf header.
 		 */
-		if (ec->ec_capabilities & ETHERCAP_VLAN_HWTAGGING) {
+		if (ec->ec_capenable & ETHERCAP_VLAN_HWTAGGING) {
 			vlan_set_tag(m, mib->ifvm_tag);
 		} else {
 			/*
 			 * insert the tag ourselves
 			 */
 			M_PREPEND(m, mib->ifvm_encaplen, M_DONTWAIT);
 			if (m == NULL) {
 				printf("%s: unable to prepend encap header",
 				    p->if_xname);
 				ifp->if_oerrors++;
 				continue;
+			}
 @@ -1481,27 +1482,27 @@ vlan_transmit(struct ifnet *ifp, struct
 	ec = (void *)mib->ifvm_p;
 	bpf_mtap(ifp, m, BPF_D_OUT);
 	if ((error = pfil_run_hooks(ifp->if_pfil, &m, ifp, PFIL_OUT)) != 0)
 		goto out;
 	if (m == NULL)
 		goto out;
 	/*
 	 * If the parent can insert the tag itself, just mark
 	 * the tag in the mbuf header.
 	 */
-	if (ec->ec_capabilities & ETHERCAP_VLAN_HWTAGGING) {
+	if (ec->ec_capenable & ETHERCAP_VLAN_HWTAGGING) {
 		vlan_set_tag(m, mib->ifvm_tag);
 	} else {
 		/*
 		 * insert the tag ourselves
 		 */
 		M_PREPEND(m, mib->ifvm_encaplen, M_DONTWAIT);
 		if (m == NULL) {
 			printf("%s: unable to prepend encap header",
 			    p->if_xname);
 			ifp->if_oerrors++;
 			error = ENOBUFS;
 			goto out;
+		}