diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-06-11 14:27:14 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-06-11 14:27:14 +0000 |
| commit | 9f7e3d1b4219ea8a91ad3ba3dbe600fd8168e8f6 (patch) | |
| tree | f2cc98ec6fe4297b5c0a48f0fbca981f86f7bda7 /sys/netinet6 | |
| parent | 80371564aea4eec6554429f079a5d534d699bf00 (diff) | |
back out tree breakage. Like, come on
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6.h | 7 | ||||
| -rw-r--r-- | sys/netinet6/ip6_output.c | 12 | ||||
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/udp6_output.c | 4 |
4 files changed, 9 insertions, 18 deletions
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index ec4f23dcc67..a2b3ff3d962 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.h,v 1.33 2004/06/11 08:09:29 itojun Exp $ */ +/* $OpenBSD: in6.h,v 1.34 2004/06/11 14:27:13 deraadt Exp $ */ /* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */ /* @@ -407,10 +407,7 @@ struct route_in6 { #endif #define IPV6_FAITH 29 /* bool; accept FAITH'ed connections */ -/* 30-41: reserved */ -#define IPV6_USE_MIN_MTU 42 /* bool; send packets at the minimum MTU */ - -/* 43-52, 57-59: reserved */ +/* 30-52, 57-59: reserved */ #define IPV6_AUTH_LEVEL 53 /* int; authentication used */ #define IPV6_ESP_TRANS_LEVEL 54 /* int; transport encryption */ #define IPV6_ESP_NETWORK_LEVEL 55 /* int; full-packet encryption */ diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 434bc41a7ca..c53ab69ab3c 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.83 2004/06/11 08:09:29 itojun Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.84 2004/06/11 14:27:13 deraadt Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -1318,7 +1318,6 @@ ip6_ctloutput(op, so, level, optname, mp) case IPV6_RTHDR: case IPV6_FAITH: case IPV6_V6ONLY: - case IPV6_USE_MIN_MTU: if (optlen != sizeof(int)) { error = EINVAL; break; @@ -1377,10 +1376,6 @@ do { \ OPTSET(IN6P_FAITH); break; - case IPV6_USE_MIN_MTU: - OPTSET(IN6P_MINMTU); - break; - case IPV6_V6ONLY: if (!optval) error = EINVAL; @@ -1548,7 +1543,6 @@ do { \ case IPV6_FAITH: case IPV6_V6ONLY: case IPV6_PORTRANGE: - case IPV6_USE_MIN_MTU: switch (optname) { case IPV6_UNICAST_HOPS: @@ -1610,10 +1604,6 @@ do { \ optval = 0; break; } - - case IPV6_USE_MIN_MTU: - optval = OPTBIT(IN6P_MINMTU); - break; } *mp = m = m_get(M_WAIT, MT_SOOPTS); m->m_len = sizeof(int); diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 14e3598250a..b1d6c5e0582 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.25 2004/06/11 08:09:29 itojun Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.26 2004/06/11 14:27:13 deraadt Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -480,8 +480,10 @@ rip6_output(struct mbuf *m, ...) } flags = 0; +#ifdef IN6P_MINMTU if (in6p->in6p_flags & IN6P_MINMTU) flags |= IPV6_MINMTU; +#endif error = ip6_output(m, optp, &in6p->in6p_route, flags, in6p->in6p_moptions, &oifp); diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c index ff60e554d45..cc8ccff2e2b 100644 --- a/sys/netinet6/udp6_output.c +++ b/sys/netinet6/udp6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp6_output.c,v 1.10 2004/06/11 08:09:29 itojun Exp $ */ +/* $OpenBSD: udp6_output.c,v 1.11 2004/06/11 14:27:13 deraadt Exp $ */ /* $KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $ */ /* @@ -262,8 +262,10 @@ udp6_output(in6p, m, addr6, control) } flags = 0; +#ifdef IN6P_MINMTU if (in6p->in6p_flags & IN6P_MINMTU) flags |= IPV6_MINMTU; +#endif udp6stat.udp6s_opackets++; error = ip6_output(m, in6p->in6p_outputopts, &in6p->in6p_route, |