Module Name: src Committed By: yamaguchi Date: Thu Sep 30 04:02:27 UTC 2021
Modified Files: src/sys/dev/pci/ixgbe: ixv.c Log Message: Remove vlan_ifdetach() from ixv_detach() The removed function is called in ether_ifdetach(). To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.168 src/sys/dev/pci/ixgbe/ixv.c:1.169 --- src/sys/dev/pci/ixgbe/ixv.c:1.168 Thu Sep 16 09:55:28 2021 +++ src/sys/dev/pci/ixgbe/ixv.c Thu Sep 30 04:02:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ixv.c,v 1.168 2021/09/16 09:55:28 msaitoh Exp $ */ +/* $NetBSD: ixv.c,v 1.169 2021/09/30 04:02:27 yamaguchi Exp $ */ /****************************************************************************** @@ -35,7 +35,7 @@ /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.168 2021/09/16 09:55:28 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.169 2021/09/30 04:02:27 yamaguchi Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.16 #endif #include "ixgbe.h" -#include "vlan.h" /************************************************************************ * Driver version @@ -603,17 +602,11 @@ ixv_detach(device_t dev, int flags) /* Stop the interface. Callouts are stopped in it. */ ixv_ifstop(adapter->ifp, 1); -#if NVLAN > 0 - /* Make sure VLANs are not using driver */ - if (!VLAN_ATTACHED(&adapter->osdep.ec)) - ; /* nothing to do: no VLANs */ - else if ((flags & (DETACH_SHUTDOWN | DETACH_FORCE)) != 0) - vlan_ifdetach(adapter->ifp); - else { + if (VLAN_ATTACHED(&adapter->osdep.ec) && + (flags & (DETACH_SHUTDOWN | DETACH_FORCE)) == 0) { aprint_error_dev(dev, "VLANs in use, detach first\n"); return EBUSY; } -#endif ether_ifdetach(adapter->ifp); callout_halt(&adapter->timer, NULL);