diff options
| author |   dlg <dlg@openbsd.org> | 2015-03-31 11:47:09 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2015-03-31 11:47:09 +0000 |
| commit | 6dd3d2c4c3539f23c9dc2039bc23a827ccb79d63 (patch) | |
| tree | 4c2972e3907c37707e7f0bf62bbcd9f7d3ffbbf2 | |
| parent | Add missing call to atexit() to clean up temp files on error. (diff) | |
| download | wireguard-openbsd-6dd3d2c4c3539f23c9dc2039bc23a827ccb79d63.tar.xz wireguard-openbsd-6dd3d2c4c3539f23c9dc2039bc23a827ccb79d63.zip | |
let vlan(4) mtu be limited by the parents hardmtu, not current mtu.
this lets you have networks on the "native" (untagged) vlan on an
interface at 1500, while setting a child vlan interfaces mtu to
jumbos.
ok sthen@ henning@ chris@
| -rw-r--r-- | sys/net/if_vlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 25fe1c84606..285ea750d5d 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.112 2015/02/06 08:07:09 henning Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.113 2015/03/31 11:47:09 dlg Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -377,9 +377,9 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, u_int16_t tag) ifv->ifv_if.if_baudrate = p->if_baudrate; if (p->if_capabilities & IFCAP_VLAN_MTU) - ifv->ifv_if.if_mtu = p->if_mtu; + ifv->ifv_if.if_mtu = p->if_hardmtu; else - ifv->ifv_if.if_mtu = p->if_mtu - EVL_ENCAPLEN; + ifv->ifv_if.if_mtu = p->if_hardmtu - EVL_ENCAPLEN; ifv->ifv_if.if_flags = p->if_flags & (IFF_UP | IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); |