3 files changed, 3 insertions, 22 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index a5b8ae261be..20bbcd1ce33 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frag6.c,v 1.77 2017/10/29 14:56:36 florian Exp $	*/
+/*	$OpenBSD: frag6.c,v 1.78 2017/11/05 13:19:59 florian Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -633,20 +633,3 @@ frag6_slowtimo(void)
 
 	NET_UNLOCK();
 }
-
-/*
- * Drain off all datagram fragments.
- */
-void
-frag6_drain(void)
-{
-	struct ip6q *q6;
-
-	if (ip6q_lock_try() == 0)
-		return;
-	while ((q6 = TAILQ_FIRST(&frag6_queue)) != NULL) {
-		ip6stat_inc(ip6s_fragdropped);
-		frag6_freef(q6);
-	}
-	IP6Q_UNLOCK();
-}
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index a112d731163..ea889b3d3ec 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_proto.c,v 1.96 2017/11/02 14:01:18 florian Exp $	*/
+/*	$OpenBSD: in6_proto.c,v 1.97 2017/11/05 13:19:59 florian Exp $	*/
 /*	$KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $	*/
 
 /*
@@ -127,7 +127,6 @@ struct protosw inet6sw[] = {
   .pr_protocol	= IPPROTO_IPV6,
   .pr_init	= ip6_init,
   .pr_slowtimo	= frag6_slowtimo,
-  .pr_drain	= frag6_drain,
   .pr_sysctl	= ip6_sysctl
 },
 {
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 09dd373bc3e..370f23f804b 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_var.h,v 1.80 2017/11/02 14:01:18 florian Exp $	*/
+/*	$OpenBSD: ip6_var.h,v 1.81 2017/11/05 13:19:59 florian Exp $	*/
 /*	$KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $	*/
 
 /*
@@ -334,7 +334,6 @@ void	frag6_init(void);
 int	frag6_input(struct mbuf **, int *, int, int);
 int	frag6_deletefraghdr(struct mbuf *, int);
 void	frag6_slowtimo(void);
-void	frag6_drain(void);
 
 void	rip6_init(void);
 int	rip6_input(struct mbuf **, int *, int, int);