[src/trunk]: src/sys/dev/pci/ixgbe Remove vlan_ifdetach() from ixv_detach()

[yamaguchi <yamaguchi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/717a7eae5e1e
branches:  trunk
changeset: 987512:717a7eae5e1e
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Thu Sep 30 04:02:27 2021 +0000

description:
Remove vlan_ifdetach() from ixv_detach()

The removed function is called in ether_ifdetach().

diffstat:

 sys/dev/pci/ixgbe/ixv.c |  15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diffs (46 lines):

diff -r 638d3d8d2ae9 -r 717a7eae5e1e sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Thu Sep 30 03:57:48 2021 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Thu Sep 30 04:02:27 2021 +0000
@@ -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 @@
 #endif
 
 #include "ixgbe.h"
-#include "vlan.h"
 
 /************************************************************************
  * Driver version
@@ -603,17 +602,11 @@
        /* 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);