remove mobileip(4)

noone seems to use it, and we should not encourage people to use
it by having it available. it's been disabled for most of the last
release and noones asked for it in 6.6, so i'm taking that as an
ok for this removal.

3 files changed, 4 insertions, 34 deletions

diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 3d19d0a9d48..a52ed23c127 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.h,v 1.136 2019/10/25 01:46:02 dlg Exp $	*/
+/*	$OpenBSD: in.h,v 1.137 2019/11/04 23:52:28 dlg Exp $	*/
 /*	$NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $	*/
 
 /*
@@ -441,7 +441,7 @@ struct ip_mreq {
 	{ 0, 0 }, \
 	{ 0, 0 }, \
 	{ 0, 0 }, \
-	{ "mobileip", CTLTYPE_NODE }, \
+	{ 0, 0 }, \
 	{ 0, 0 }, \
 	{ 0, 0 }, \
 	{ 0, 0 }, \
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 53e86b16b33..f474f0ca901 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_proto.c,v 1.93 2019/07/15 12:40:42 bluhm Exp $	*/
+/*	$OpenBSD: in_proto.c,v 1.94 2019/11/04 23:52:28 dlg Exp $	*/
 /*	$NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $	*/
 
 /*
@@ -172,11 +172,6 @@
 #include <net/if_etherip.h>
 #endif
 
-#include "mobileip.h"
-#if NMOBILEIP > 0
-#include <net/if_mobileip.h>
-#endif
-
 u_char ip_protox[IPPROTO_MAX];
 
 const struct protosw inetsw[] = {
@@ -354,20 +349,6 @@ const struct protosw inetsw[] = {
   .pr_sysctl	= gre_sysctl
 },
 #endif /* NGRE > 0 */
-#if NMOBILEIP > 0
-{
-  .pr_type	= SOCK_RAW,
-  .pr_domain	= &inetdomain,
-  .pr_protocol	= IPPROTO_MOBILE,
-  .pr_flags	= PR_ATOMIC|PR_ADDR,
-  .pr_input	= mobileip_input,
-  .pr_ctloutput	= rip_ctloutput,
-  .pr_usrreq	= rip_usrreq,
-  .pr_attach	= rip_attach,
-  .pr_detach	= rip_detach,
-  .pr_sysctl	= mobileip_sysctl
-},
-#endif /* NMOBILEIP > 0 */
 #if NCARP > 0
 {
   .pr_type	= SOCK_RAW,
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
index 3a517896cf3..8c5f742d145 100644
--- a/sys/netinet/ip_gre.h
+++ b/sys/netinet/ip_gre.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip_gre.h,v 1.13 2018/02/07 22:30:59 dlg Exp $ */
+/*      $OpenBSD: ip_gre.h,v 1.14 2019/11/04 23:52:28 dlg Exp $ */
 /*	$NetBSD: ip_gre.h,v 1.3 1998/10/07 23:33:02 thorpej Exp $ */
 
 /*
@@ -52,17 +52,6 @@
         { "wccp", CTLTYPE_INT }, \
 }
 
-/*
- * Names for MobileIP sysctl objects
- */
-#define MOBILEIPCTL_ALLOW    1		/* accept incoming MobileIP packets */
-#define MOBILEIPCTL_MAXID    2
-
-#define MOBILEIPCTL_NAMES { \
-        { 0, 0 }, \
-        { "allow", CTLTYPE_INT }, \
-}
-
 #ifdef _KERNEL
 int     gre_usrreq(struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *);
 #endif /* _KERNEL */