removed IPv6 inputopts.

kame · Sep 21, 2003 · 14e1047ce7f0f0d552307db9ea122737908bc2b7 · 14e1047
1 parent 0431191
commit 14e1047ce7f0f0d552307db9ea122737908bc2b7
Unified Split

Showing with 0 additions and 11 deletions.

+0 −5 openbsd/sys/netinet/in_pcb.c

+0 −6 openbsd/sys/netinet/in_pcb.h
diff --git a/openbsd/sys/netinet/in_pcb.c b/openbsd/sys/netinet/in_pcb.c
@@ -491,11 +491,6 @@ in_pcbdetach(v)
 		ip_freemoptions(inp->inp_moptions);
 #ifdef INET6
 	ip6_freepcbopts(inp->inp_outputopts6);
-	/* Free all received options. */
-	if (inp->inp_inputopts6) {
-		m_freem(inp->inp_inputopts6->head); /* this is safe */
-		FREE(inp->inp_inputopts6, M_IP6OPT);
-	}
 #endif /* INET6 */
 #ifdef IPSEC
 	/* IPsec cleanup here */
diff --git a/openbsd/sys/netinet/in_pcb.h b/openbsd/sys/netinet/in_pcb.h
@@ -126,11 +126,6 @@ struct inpcb {
 #define	inp_ip		inp_hu.hu_ip
 #define	inp_ipv6	inp_hu.hu_ipv6
 	struct	  mbuf *inp_options;	/* IPv4 options */
-	/*
-	 * IP6 options for incoming packets.
-	 * XXX: currently unused but remained just in case.
-	 */
-	struct ip6_recvpktopts *inp_inputopts6;
 	struct ip6_pktopts *inp_outputopts6; /* IP6 opts for outgoing pkts */
 	int inp_hops;
 	union {
@@ -168,7 +163,6 @@ struct inpcb {
  * other *BSDs.
  */
 #define in6p_socket inp_socket
-#define in6p_inputopts inp_inputopts6
 #define in6p_outputopts inp_outputopts6
 #define in6p_hops inp_hops
 #define in6p_lport inp_lport