[src/trunk]: src/sys/dev/pci/ixgbe Don't call set_vfta() if any VLAN is attac...

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

details:   https://anonhg.NetBSD.org/src/rev/2cc3f53fdd55
branches:  trunk
changeset: 962108:2cc3f53fdd55
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jun 27 09:56:39 2019 +0000

description:
Don't call set_vfta() if any VLAN is attached.
XXX pullup-8.

diffstat:

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

diffs (25 lines):

diff -r 1b4f74291af7 -r 2cc3f53fdd55 sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Thu Jun 27 06:00:11 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Thu Jun 27 09:56:39 2019 +0000
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.115 2019/05/29 10:07:30 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.116 2019/06/27 09:56:39 msaitoh Exp $*/
 
 /******************************************************************************
 
@@ -2000,11 +2000,11 @@
                rxr->vtag_strip = hwtagging ? TRUE : FALSE;
        }
 
-#if 1
-       /* XXX dirty hack. Enable all VIDs */
+       /* XXX dirty hack. Enable all VIDs if any VLAN is attached */
        for (int i = 0; i < IXGBE_VFTA_SIZE; i++)
-         adapter->shadow_vfta[i] = 0xffffffff;
-#endif
+               adapter->shadow_vfta[i]
+                   = VLAN_ATTACHED(&adapter->osdep.ec) ? 0xffffffff : 0;
+
        /*
         * A soft reset zero's out the VFTA, so
         * we need to repopulate it now.