From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Fri, 17 Mar 2017 21:10:50 +0000 (-0700)
Subject: kernel - Remove if_sl, if_ppp, and if_faith from the kernel build
X-Git-Tag: v5.1.0~732
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/0baf00684b86029ecc285439ef7e5399648cb1d9

kernel - Remove if_sl, if_ppp, and if_faith from the kernel build

* Remove if_sl, if_ppp, and if_faith from the kernel build.  These
  interfaces may be loaded as modules.

* Add missing MODULE_VERSION for if_sl and if_ppp.  This allows these
  modules to be specified in /boot/loader.conf without crashing the
  kernel if the kernel already happens to build them in, for forwards
  and backwards run-time compatibility.
---

diff --git a/sys/config/VKERNEL64 b/sys/config/VKERNEL64
index cec557f71e..5974659cf8 100644
--- a/sys/config/VKERNEL64
+++ b/sys/config/VKERNEL64
@@ -68,14 +68,11 @@ options 	INVARIANTS
 # Pseudo devices - the number indicates how many units to allocate.
 pseudo-device	loop		# Network loopback
 pseudo-device	ether		# Ethernet support
-pseudo-device	sl	1	# Kernel SLIP
-pseudo-device	ppp	1	# Kernel PPP
 pseudo-device	tun		# Packet tunnel.
 pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	md		# Memory "disks"
 pseudo-device	vn		# File image "disks"
 pseudo-device	gif		# IPv6 and IPv4 tunneling
-pseudo-device	faith	1	# IPv6-to-IPv4 relaying (translation)
 
 #pseudo-device	carp
 
diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC
index a637760e13..b9d7344bf6 100644
--- a/sys/config/X86_64_GENERIC
+++ b/sys/config/X86_64_GENERIC
@@ -273,14 +273,11 @@ device		sn0	at isa? disable port 0x300 irq 10
 # Pseudo devices - the number indicates how many units to allocate.
 pseudo-device	loop		# Network loopback
 pseudo-device	ether		# Ethernet support
-pseudo-device	sl	1	# Kernel SLIP
-pseudo-device	ppp	1	# Kernel PPP
 pseudo-device	tun		# Packet tunnel.
 pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	md		# Memory "disks"
 pseudo-device	vn		# File image "disks"
 pseudo-device	gif		# IPv6 and IPv4 tunneling
-pseudo-device	faith	1	# IPv6-to-IPv4 relaying (translation)
 pseudo-device   lagg
 
 # CARP support
diff --git a/sys/net/ppp/if_ppp.c b/sys/net/ppp/if_ppp.c
index 114dcdace7..175bd4a241 100644
--- a/sys/net/ppp/if_ppp.c
+++ b/sys/net/ppp/if_ppp.c
@@ -1573,3 +1573,5 @@ ppp_ifstart(struct ifnet *ifp, struct ifaltq_subque *ifsq __unused)
 	sc = ifp->if_softc;
 	(*sc->sc_start)(sc);
 }
+
+MODULE_VERSION(if_ppp, 1);
diff --git a/sys/net/ppp_layer/Makefile b/sys/net/ppp_layer/Makefile
index bf497e4f02..6f6358c712 100644
--- a/sys/net/ppp_layer/Makefile
+++ b/sys/net/ppp_layer/Makefile
@@ -5,7 +5,7 @@ KMOD=   if_ppp
 SRCS=	if_ppp.c ppp_tty.c slcompress.c \
 	use_ppp.h opt_inet.h opt_ppp.h
 
-NPPP?=		2
+NPPP?=		4
 PPP_BSDCOMP?=	1	# 0/1
 PPP_DEFLATE?=	1	# 0/1
 PPP_FILTER?=	1	# 0/1 - requires bpf to be configured in kernel
diff --git a/sys/net/sl/Makefile b/sys/net/sl/Makefile
index 1ea6be7c5f..f4749b5d27 100644
--- a/sys/net/sl/Makefile
+++ b/sys/net/sl/Makefile
@@ -4,7 +4,7 @@
 KMOD=   if_sl
 SRCS=   if_sl.c slcompress.c opt_inet.h use_sl.h
 
-NSL?=		2
+NSL?=		4
 
 KCFLAGS+=	-DINET
 
diff --git a/sys/net/sl/if_sl.c b/sys/net/sl/if_sl.c
index e824106dbe..c8c814c99d 100644
--- a/sys/net/sl/if_sl.c
+++ b/sys/net/sl/if_sl.c
@@ -1084,3 +1084,5 @@ sl_outfill(void *chan)
 	}
 	lwkt_reltoken(&tty_token);
 }
+
+MODULE_VERSION(if_sl, 1);