[src/trunk]: src/sys/dev/pci/ixgbe Fixes link error without vlan. PR#49879.

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

details:   https://anonhg.NetBSD.org/src/rev/007217c974fb
branches:  trunk
changeset: 337983:007217c974fb
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed May 06 09:21:22 2015 +0000

description:
Fixes link error without vlan. PR#49879.

diffstat:

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

diffs (34 lines):

diff -r f4d58f932a59 -r 007217c974fb sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Wed May 06 05:57:48 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Wed May 06 09:21:22 2015 +0000
@@ -59,12 +59,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 250108 2013-04-30 16:18:29Z luigi $*/
-/*$NetBSD: ixgbe.c,v 1.28 2015/04/24 07:00:51 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.29 2015/05/06 09:21:22 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
 
 #include "ixgbe.h"
+#include "vlan.h"
 
 /*********************************************************************
  *  Set this to one to display debug statistics
@@ -716,6 +717,7 @@
 
        INIT_DEBUGOUT("ixgbe_detach: begin");
 
+#if NVLAN > 0
        /* Make sure VLANs are not using driver */
        if (!VLAN_ATTACHED(&adapter->osdep.ec))
                ;       /* nothing to do: no VLANs */ 
@@ -725,6 +727,7 @@
                aprint_error_dev(dev, "VLANs in use\n");
                return EBUSY;
        }
+#endif
 
        IXGBE_CORE_LOCK(adapter);
        ixgbe_stop(adapter);