remove never-visited function icmp6_ctloutput().

for openbsd, this is integrated into rip6_ctloutput().

2 files changed, 2 insertions, 82 deletions

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 428e6720b01..78db3053f74 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.4 2000/01/02 04:52:26 itojun Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.5 2000/01/08 13:54:36 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -1776,84 +1776,6 @@ fail:
 }
 
 /*
- * ICMPv6 socket option processing.
- */
-int
-icmp6_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	int error = 0;
-	int optlen;
-	register struct inpcb *inp = sotoinpcb(so);
-	register struct mbuf *m = *mp;
-
-	optlen = m ? m->m_len : 0;
-
-	if (level != IPPROTO_ICMPV6) {
-		if (op == PRCO_SETOPT && m)
-			(void)m_free(m);
-		return EINVAL;
-	}
-
-	switch(op) {
-	case PRCO_SETOPT:
-		switch (optname) {
-		case ICMP6_FILTER:
-		    {
-			struct icmp6_filter *p;
-
-			if (optlen != sizeof(*p)) {
-				error = EMSGSIZE;
-				break;
-			}
-			p = mtod(m, struct icmp6_filter *);
-			if (!p || !inp->inp_icmp6filt) {
-				error = EINVAL;
-				break;
-			}
-			bcopy(p, inp->inp_icmp6filt,
-				sizeof(struct icmp6_filter));
-			error = 0;
-			break;
-		    }
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		break;
-
-	case PRCO_GETOPT:
-		switch (optname) {
-		case ICMP6_FILTER:
-		    {
-			struct icmp6_filter *p;
-
-			p = mtod(m, struct icmp6_filter *);
-			if (!p || !inp->inp_icmp6filt) {
-				error = EINVAL;
-				break;
-			}
-			bcopy(inp->inp_icmp6filt, p,
-				sizeof(struct icmp6_filter));
-			error = 0;
-			break;
-		    }
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		break;
-	}
-
-	return(error);
-}
-
-/*
  * Perform rate limit check.
  * Returns 0 if it is okay to send the icmp6 packet.
  * Returns 1 if the router SHOULD NOT send this icmp6 packet due to rate
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index dcac54dd1dc..1d4f4b3f023 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_var.h,v 1.2 1999/12/10 10:04:28 angelos Exp $	*/
+/*	$OpenBSD: ip6_var.h,v 1.3 2000/01/08 13:54:36 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -213,8 +213,6 @@ extern int ip6_auto_flowlabel;
 struct in6pcb;
 struct inpcb;
 
-int	icmp6_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-
 void	ip6_init __P((void));
 void	ip6intr __P((void));
 void	ip6_input __P((struct mbuf *));