diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2020-07-22 01:30:55 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2020-07-22 01:30:55 +0000 |
| commit | e38c7eb467620d279f738451e80d8ce868b9a3ca (patch) | |
| tree | 1719bf088286c23236d4f6af0b96ae4cbb1b2e8a /sys/net/if_vlan_var.h | |
| parent | 22ad5c772ea0eaf700df338e6b8d9f1e244ee4c7 (diff) | |
move vlan_input into ether_input, instead of via an input handler.
this means there's a consistent order of processing of service
delimited (vlan and svlan) packets and bridging of packets. vlan
and svlan get to look at a packet first. it's only if they decline
a packet that a bridge can handle it. this allows operators to slice
vlans out for processing separate to the "native" vlan handling if
they want.
while here, this fixes up a bug in vlan_input if m_pullup needed
to prepend an mbuf.
this has been in snaps as part of a larger diff for over a week.
Diffstat (limited to 'sys/net/if_vlan_var.h')
| -rw-r--r-- | sys/net/if_vlan_var.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index 57c7e519f86..006ff2a822c 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan_var.h,v 1.41 2019/04/27 04:46:03 dlg Exp $ */ +/* $OpenBSD: if_vlan_var.h,v 1.42 2020/07/22 01:30:54 dlg Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -47,6 +47,7 @@ struct vlanreq { }; #ifdef _KERNEL +struct mbuf *vlan_input(struct ifnet *, struct mbuf *); struct mbuf *vlan_inject(struct mbuf *, uint16_t, uint16_t); #endif /* _KERNEL */ |