diff options
| -rw-r--r-- | sys/netinet/in_pcb.h | 5 | ||||
| -rw-r--r-- | sys/netinet6/in6.h | 5 | ||||
| -rw-r--r-- | sys/netinet6/ip6_output.c | 12 |
3 files changed, 4 insertions, 18 deletions
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 030947cad88..25d7b9b44ad 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.h,v 1.92 2015/12/02 22:13:44 vgross Exp $ */ +/* $OpenBSD: in_pcb.h,v 1.93 2015/12/03 10:34:24 tedu Exp $ */ /* $NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $ */ /* @@ -196,7 +196,6 @@ struct inpcbtable { #define IN6P_HOPOPTS 0x040000 /* receive hop-by-hop options */ #define IN6P_DSTOPTS 0x080000 /* receive dst options after rthdr */ #define IN6P_RTHDR 0x100000 /* receive routing header */ -#define IN6P_RTHDRDSTOPTS 0x200000 /* receive dstoptions before rthdr */ #define IN6P_TCLASS 0x400000 /* receive traffic class value */ #define IN6P_AUTOFLOWLABEL 0x800000 /* attach flowlabel automatically */ @@ -207,7 +206,7 @@ struct inpcbtable { #define IN6P_MINMTU 0x20000000 /* use minimum MTU */ #define IN6P_CONTROLOPTS (IN6P_PKTINFO|IN6P_HOPLIMIT|IN6P_HOPOPTS|\ - IN6P_DSTOPTS|IN6P_RTHDR|IN6P_RTHDRDSTOPTS|\ + IN6P_DSTOPTS|IN6P_RTHDR|\ IN6P_TCLASS|IN6P_AUTOFLOWLABEL|IN6P_RFC2292|\ IN6P_MTU|IN6P_RECVDSTPORT) diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 0eb366f587c..6e10b7bf9bc 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.h,v 1.86 2015/10/29 16:04:10 tedu Exp $ */ +/* $OpenBSD: in6.h,v 1.87 2015/12/03 10:34:24 tedu Exp $ */ /* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */ /* @@ -315,9 +315,6 @@ struct route_in6 { #define IPV6_RECVRTHDR 38 /* bool; recv routing header */ #define IPV6_RECVHOPOPTS 39 /* bool; recv hop-by-hop option */ #define IPV6_RECVDSTOPTS 40 /* bool; recv dst option after rthdr */ -#ifdef _KERNEL -#define IPV6_RECVRTHDRDSTOPTS 41 /* bool; recv dst option before rthdr */ -#endif #define IPV6_USE_MIN_MTU 42 /* bool; send packets at the minimum MTU */ #define IPV6_RECVPATHMTU 43 /* bool; notify an according MTU */ diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 94d60b2fe3d..bdd1728305b 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.201 2015/12/02 13:29:26 claudio Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.202 2015/12/03 10:34:24 tedu Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -1229,7 +1229,6 @@ ip6_ctloutput(int op, struct socket *so, int level, int optname, */ case IPV6_RECVHOPOPTS: case IPV6_RECVDSTOPTS: - case IPV6_RECVRTHDRDSTOPTS: if (!privileged) { error = EPERM; break; @@ -1299,10 +1298,6 @@ do { \ OPTSET(IN6P_DSTOPTS); break; - case IPV6_RECVRTHDRDSTOPTS: - OPTSET(IN6P_RTHDRDSTOPTS); - break; - case IPV6_RECVRTHDR: OPTSET(IN6P_RTHDR); break; @@ -1538,7 +1533,6 @@ do { \ case IPV6_RECVHOPOPTS: case IPV6_RECVDSTOPTS: - case IPV6_RECVRTHDRDSTOPTS: case IPV6_UNICAST_HOPS: case IPV6_RECVPKTINFO: case IPV6_RECVHOPLIMIT: @@ -1560,10 +1554,6 @@ do { \ optval = OPTBIT(IN6P_DSTOPTS); break; - case IPV6_RECVRTHDRDSTOPTS: - optval = OPTBIT(IN6P_RTHDRDSTOPTS); - break; - case IPV6_UNICAST_HOPS: optval = inp->inp_hops; break; |