netdrv intel: always enable VLAN filtering except in promiscous mode

Currently VLAN filtering is enabled when the first VLAN is added.
Obviously before that there's no point in receiving any VLAN packets.
Now that we disable VLAN filtering in promiscous mode, we can keep
the VLAN filters enabled the remaining time.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 7 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 3fe60268737a..be5953385bf6 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1792,8 +1792,6 @@ static void e1000_vlan_rx_register(struct net_device *netdev,
                 if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
                         /* enable VLAN receive filtering */
                         rctl = er32(RCTL);
-                        if (!(netdev->flags & IFF_PROMISC))
-                                rctl |= E1000_RCTL_VFE;
                         rctl &= ~E1000_RCTL_CFIEN;
                         ew32(RCTL, rctl);
                         e1000_update_mng_vlan(adapter);
@@ -1805,10 +1803,6 @@ static void e1000_vlan_rx_register(struct net_device *netdev,
                 ew32(CTRL, ctrl);
 
                 if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
-                        /* disable VLAN filtering */
-                        rctl = er32(RCTL);
-                        rctl &= ~E1000_RCTL_VFE;
-                        ew32(RCTL, rctl);
                         if (adapter->mng_vlan_id !=
                             (u16)E1000_MNG_VLAN_NONE) {
                                 e1000_vlan_rx_kill_vid(netdev,
@@ -2239,7 +2233,7 @@ static void e1000_set_multi(struct net_device *netdev)
                 } else {
                         rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE);
                 }
-                if (adapter->vlgrp && adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
+                if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
                         rctl |= E1000_RCTL_VFE;
         }