diff options
| author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2008-09-03 08:41:58 +0000 |
|---|---|---|
| committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2008-09-03 08:41:58 +0000 |
| commit | 028a8d2e89445be32b6ac5d268da5f1010089b98 (patch) | |
| tree | d9ab1fb41612aea4def353c3720374f8bfffc61c /sys | |
| parent | 52bfe4263bba85ed7b573a8997450387785cd117 (diff) | |
Remove dead code: ip6_copypktopts() is not used anywhere.
OK deraadt@, henning@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet6/ip6_output.c | 21 | ||||
| -rw-r--r-- | sys/netinet6/ip6_var.h | 3 |
2 files changed, 2 insertions, 22 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index e0fbb97cb02..2f18499bb64 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.104 2008/08/08 17:49:21 bluhm Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.105 2008/09/03 08:41:57 mpf Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -2254,25 +2254,6 @@ copypktopts(struct ip6_pktopts *dst, struct ip6_pktopts *src, int canwait) } #undef PKTOPT_EXTHDRCPY -struct ip6_pktopts * -ip6_copypktopts(struct ip6_pktopts *src, int canwait) -{ - int error; - struct ip6_pktopts *dst; - - dst = malloc(sizeof(*dst), M_IP6OPT, canwait); - if (dst == NULL && canwait == M_NOWAIT) - return (NULL); - ip6_initpktopts(dst); - - if ((error = copypktopts(dst, src, canwait)) != 0) { - free(dst, M_IP6OPT); - return (NULL); - } - - return (dst); -} - void ip6_freepcbopts(struct ip6_pktopts *pktopt) { diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index cbce4a70060..c898be9f16f 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_var.h,v 1.34 2008/06/11 06:30:36 mcbride Exp $ */ +/* $OpenBSD: ip6_var.h,v 1.35 2008/09/03 08:41:57 mpf Exp $ */ /* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */ /* @@ -299,7 +299,6 @@ void ip6_initpktopts(struct ip6_pktopts *); int ip6_setpktopts(struct mbuf *, struct ip6_pktopts *, struct ip6_pktopts *, int, int); void ip6_clearpktopts(struct ip6_pktopts *, int); -struct ip6_pktopts *ip6_copypktopts(struct ip6_pktopts *, int); int ip6_optlen(struct inpcb *); void ip6_randomid_init(void); u_int32_t ip6_randomid(void); |