Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

removed inputopts.

  • Loading branch information...
commit 04311919fd0e561e7217b661e82fe4745ed98aaf 1 parent 0e73f81
authored September 21, 2003

Showing 1 changed file with 0 additions and 15 deletions. Show diff stats Hide diff stats

  1. 15  kame/sys/netinet6/in6_pcb.c
15  kame/sys/netinet6/in6_pcb.c
@@ -138,18 +138,9 @@ in6_pcballoc(so, head)
138 138
 	in6p->in6p_fsa.sin6_family = in6p->in6p_lsa.sin6_family = AF_INET6;
139 139
 	in6p->in6p_fsa.sin6_len =
140 140
 		in6p->in6p_lsa.sin6_len = sizeof(struct sockaddr_in6);
141  
-	/* XXX: we should allocate inputopts only when we need it. */
142  
-	MALLOC(in6p->in6p_inputopts, struct ip6_recvpktopts *,
143  
-	       sizeof(struct ip6_recvpktopts), M_IP6OPT, M_NOWAIT);
144  
-	if (in6p->in6p_inputopts == NULL) {
145  
-		FREE(in6p, M_PCB);
146  
-		return (ENOBUFS); /* XXX */
147  
-	}
148  
-	bzero(in6p->in6p_inputopts, sizeof(struct ip6_recvpktopts));
149 141
 #ifdef IPSEC
150 142
 	error = ipsec_init_pcbpolicy(so, &in6p->in6p_sp);
151 143
 	if (error != 0) {
152  
-		FREE(in6p->in6p_inputopts, M_IP6OPT);
153 144
 		FREE(in6p, M_PCB);
154 145
 		return error;
155 146
 	}
@@ -535,12 +526,6 @@ in6_pcbdetach(in6p)
535 526
 		sofree(so);
536 527
 	}
537 528
 
538  
-	/* Free all received options. */
539  
-	if (in6p->in6p_inputopts) {
540  
-		m_freem(in6p->in6p_inputopts->head); /* this safe */
541  
-		FREE(in6p->in6p_inputopts, M_IP6OPT);
542  
-	}
543  
-
544 529
 	ip6_freepcbopts(in6p->in6p_outputopts);
545 530
 	ip6_freemoptions(in6p->in6p_moptions);
546 531
 

0 notes on commit 0431191

Please sign in to comment.
Something went wrong with that request. Please try again.