diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-07-16 20:16:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-16 20:16:14 -0700 |
| commit | 78ed11a56bd8679aa6d51eb36b448342c59a7824 (patch) | |
| tree | d5feb0f95f0002841d4d099aaac9fecb640bc3b5 /drivers/net/ixgbe/ixgbe_main.c | |
| parent | 746b9f0228a1c607b3db67c80da1c2a963321926 (diff) | |
| download | kernel_samsung_crespo-78ed11a56bd8679aa6d51eb36b448342c59a7824.zip kernel_samsung_crespo-78ed11a56bd8679aa6d51eb36b448342c59a7824.tar.gz kernel_samsung_crespo-78ed11a56bd8679aa6d51eb36b448342c59a7824.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index afe3a1c..7d8bf94 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -1575,8 +1575,6 @@ static void ixgbe_vlan_rx_register(struct net_device *netdev, /* enable VLAN tag insert/strip */ ctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_VLNCTRL); ctrl |= IXGBE_VLNCTRL_VME; - if (!(netdev->flags & IFF_PROMISC)) - ctrl |= IXGBE_VLNCTRL_VFE; ctrl &= ~IXGBE_VLNCTRL_CFIEN; IXGBE_WRITE_REG(&adapter->hw, IXGBE_VLNCTRL, ctrl); } @@ -1655,8 +1653,7 @@ static void ixgbe_set_multi(struct net_device *netdev) } else { fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); } - if (adapter->vlgrp) - fctrl |= IXGBE_VLNCTRL_VFE; + fctrl |= IXGBE_VLNCTRL_VFE; } IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl); |