1 files changed, 1 insertions, 10 deletions

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index ec95cd4ea58..aa75385cd6c 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1061,8 +1061,7 @@ ixgb_set_multi(struct net_device *netdev)
                 } else {
                         rctl &= ~(IXGB_RCTL_UPE | IXGB_RCTL_MPE);
                 }
-                if (adapter->vlgrp)
-                        rctl |= IXGB_RCTL_VFE;
+                rctl |= IXGB_RCTL_VFE;
         }
 
         if (netdev->mc_count > IXGB_MAX_NUM_MULTICAST_ADDRESSES) {
@@ -2109,8 +2108,6 @@ ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                 /* enable VLAN receive filtering */
 
                 rctl = IXGB_READ_REG(&adapter->hw, RCTL);
-                if (!(netdev->flags & IFF_PROMISC))
-                        rctl |= IXGB_RCTL_VFE;
                 rctl &= ~IXGB_RCTL_CFIEN;
                 IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
         } else {
@@ -2119,12 +2116,6 @@ ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                 ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
                 ctrl &= ~IXGB_CTRL0_VME;
                 IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
-
-                /* disable VLAN filtering */
-
-                rctl = IXGB_READ_REG(&adapter->hw, RCTL);
-                rctl &= ~IXGB_RCTL_VFE;
-                IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
         }
 
         /* don't enable interrupts unless we are UP */