diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-11-06 17:08:57 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-11-06 17:08:57 +0000 |
| commit | 053b3699ff6ea12fad5d06c2ef858f833db52024 (patch) | |
| tree | 37ea570763cbfc3919979d760baae45fccbed2d0 | |
| parent | Replace sc_dying in favour of usbd_is_dying() and usbd_deactivate(). (diff) | |
| download | wireguard-openbsd-053b3699ff6ea12fad5d06c2ef858f833db52024.tar.xz wireguard-openbsd-053b3699ff6ea12fad5d06c2ef858f833db52024.zip | |
See previous commit. This is the next step in the process. The code now
accepts either format, but we start using the IETF bits. Hopefully we
get a mail later again from David Dahlberg reminding us to remove the
legacy acceptance.
| -rw-r--r-- | sys/netinet/ip_ether.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c index a3c7dead536..f53041eabf7 100644 --- a/sys/netinet/ip_ether.c +++ b/sys/netinet/ip_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ether.c,v 1.62 2013/01/14 23:06:09 deraadt Exp $ */ +/* $OpenBSD: ip_ether.c,v 1.63 2013/11/06 17:08:57 deraadt Exp $ */ /* * The author of this code is Angelos D. Keromytis (kermit@adk.gr) * @@ -571,8 +571,8 @@ etherip_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int proto) * * We will transition step by step to the new model. */ - eip.eip_ver = 0; - eip.eip_oldver = ETHERIP_VERSION; + eip.eip_ver = ETHERIP_VERSION; + eip.eip_oldver = 0; eip.eip_pad = 0; m_copyback(m, hlen - sizeof(struct etherip_header), sizeof(struct etherip_header), &eip, M_NOWAIT); |