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>
This commit is contained in:

committed by
David S. Miller

orang tua
70efce27fc
melakukan
746b9f0228
@@ -1792,7 +1792,8 @@ 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);
|
||||
rctl |= E1000_RCTL_VFE;
|
||||
if (!(netdev->flags & IFF_PROMISC))
|
||||
rctl |= E1000_RCTL_VFE;
|
||||
rctl &= ~E1000_RCTL_CFIEN;
|
||||
ew32(RCTL, rctl);
|
||||
e1000_update_mng_vlan(adapter);
|
||||
@@ -2230,11 +2231,16 @@ static void e1000_set_multi(struct net_device *netdev)
|
||||
|
||||
if (netdev->flags & IFF_PROMISC) {
|
||||
rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
|
||||
} else if (netdev->flags & IFF_ALLMULTI) {
|
||||
rctl |= E1000_RCTL_MPE;
|
||||
rctl &= ~E1000_RCTL_UPE;
|
||||
rctl &= ~E1000_RCTL_VFE;
|
||||
} else {
|
||||
rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE);
|
||||
if (netdev->flags & IFF_ALLMULTI) {
|
||||
rctl |= E1000_RCTL_MPE;
|
||||
rctl &= ~E1000_RCTL_UPE;
|
||||
} else {
|
||||
rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE);
|
||||
}
|
||||
if (adapter->vlgrp && adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
|
||||
rctl |= E1000_RCTL_VFE;
|
||||
}
|
||||
|
||||
ew32(RCTL, rctl);
|
||||
|
Reference in New Issue
Block a user