diff options
author | Patrick McHardy <kaber@trash.net> | 2008-07-16 23:15:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-16 23:15:45 -0400 |
commit | 746b9f0228a1c607b3db67c80da1c2a963321926 (patch) | |
tree | ea5e89d69279918691885c7c2abbc8a0894f4c9c /drivers/net/ixgbe/ixgbe_main.c | |
parent | 70efce27fc3d54271519244dc5e47da4ed711dd4 (diff) |
netdrv intel: disable VLAN filtering in promiscous mode
As discussed in this thread:
http://www.mail-archive.com/netdev@vger.kernel.org/msg53976.html
promiscous mode means to disable *all* filters. Currently only unicast
and multicast filtering is disabled. This patch changes all Intel
drivers to also disable VLAN filtering.
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 | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 10a1c8c5cda1..afe3a1cdfdbd 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1574,7 +1574,9 @@ static void ixgbe_vlan_rx_register(struct net_device *netdev, | |||
1574 | if (grp) { | 1574 | if (grp) { |
1575 | /* enable VLAN tag insert/strip */ | 1575 | /* enable VLAN tag insert/strip */ |
1576 | ctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_VLNCTRL); | 1576 | ctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_VLNCTRL); |
1577 | ctrl |= IXGBE_VLNCTRL_VME | IXGBE_VLNCTRL_VFE; | 1577 | ctrl |= IXGBE_VLNCTRL_VME; |
1578 | if (!(netdev->flags & IFF_PROMISC)) | ||
1579 | ctrl |= IXGBE_VLNCTRL_VFE; | ||
1578 | ctrl &= ~IXGBE_VLNCTRL_CFIEN; | 1580 | ctrl &= ~IXGBE_VLNCTRL_CFIEN; |
1579 | IXGBE_WRITE_REG(&adapter->hw, IXGBE_VLNCTRL, ctrl); | 1581 | IXGBE_WRITE_REG(&adapter->hw, IXGBE_VLNCTRL, ctrl); |
1580 | } | 1582 | } |
@@ -1645,11 +1647,16 @@ static void ixgbe_set_multi(struct net_device *netdev) | |||
1645 | 1647 | ||
1646 | if (netdev->flags & IFF_PROMISC) { | 1648 | if (netdev->flags & IFF_PROMISC) { |
1647 | fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); | 1649 | fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); |
1648 | } else if (netdev->flags & IFF_ALLMULTI) { | 1650 | fctrl &= ~IXGBE_VLNCTRL_VFE; |
1649 | fctrl |= IXGBE_FCTRL_MPE; | ||
1650 | fctrl &= ~IXGBE_FCTRL_UPE; | ||
1651 | } else { | 1651 | } else { |
1652 | fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); | 1652 | if (netdev->flags & IFF_ALLMULTI) { |
1653 | fctrl |= IXGBE_FCTRL_MPE; | ||
1654 | fctrl &= ~IXGBE_FCTRL_UPE; | ||
1655 | } else { | ||
1656 | fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); | ||
1657 | } | ||
1658 | if (adapter->vlgrp) | ||
1659 | fctrl |= IXGBE_VLNCTRL_VFE; | ||
1653 | } | 1660 | } |
1654 | 1661 | ||
1655 | IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl); | 1662 | IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl); |