summaryrefslogtreecommitdiff
path: root/sys/net/if_vlan.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2016-03-29 13:55:43 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2016-03-29 13:55:43 +0000
commit4b3059977835d419e7c3b69e206ba817ce62d687 (patch)
treebf54631db53acd605c22230b59c985d11eeca475 /sys/net/if_vlan.c
parentb02fb201875330364b210237c4cc192bc1d52ed2 (diff)
the stack checks the mac address of rxed packets, so vlan(4) doesnt have to
ok mpi@ claudio@
Diffstat (limited to 'sys/net/if_vlan.c')
-rw-r--r--sys/net/if_vlan.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 170bc9f732b..772f5a636a8 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vlan.c,v 1.157 2016/03/29 04:33:16 dlg Exp $ */
+/* $OpenBSD: if_vlan.c,v 1.158 2016/03/29 13:55:42 dlg Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
@@ -375,18 +375,6 @@ vlan_input(struct ifnet *ifp0, struct mbuf *m, void *cookie)
goto drop;
/*
- * Drop promiscuously received packets if we are not in
- * promiscuous mode.
- */
- if (!ETHER_IS_MULTICAST(eh->ether_dhost) &&
- (ifp0->if_flags & IFF_PROMISC) &&
- (ifv->ifv_if.if_flags & IFF_PROMISC) == 0) {
- if (bcmp(&ifv->ifv_ac.ac_enaddr, eh->ether_dhost,
- ETHER_ADDR_LEN))
- goto drop;
- }
-
- /*
* Having found a valid vlan interface corresponding to
* the given source interface and vlan tag, remove the
* encapsulation.