Module Name: src
Committed By: pgoyette
Date: Sat Aug 6 22:03:45 UTC 2016
Modified Files:
src/distrib/sets/lists/modules: mi
src/sys/modules: Makefile
src/sys/net: if_spppsubr.c
Added Files:
src/sys/modules/sppp_subr: Makefile
Log Message:
Modularize the sppp_subr stuff so it can be shared by pppoe and lmc
drivers as they get modularized.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.172 -r1.173 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/sppp_subr/Makefile
cvs rdiff -u -r1.146 -r1.147 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.90 src/distrib/sets/lists/modules/mi:1.91
--- src/distrib/sets/lists/modules/mi:1.90 Sat Aug 6 12:50:37 2016
+++ src/distrib/sets/lists/modules/mi Sat Aug 6 22:03:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.90 2016/08/06 12:50:37 christos Exp $
+# $NetBSD: mi,v 1.91 2016/08/06 22:03:45 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -244,6 +244,8 @@
./@MODULEDIR@/solaris/solaris.kmod base-kernel-modules kmod,solaris
./@MODULEDIR@/spdmem base-kernel-modules kmod
./@MODULEDIR@/spdmem/spdmem.kmod base-kernel-modules kmod
+./@MODULEDIR@/sppp_subr base-kernel-modules kmod
+./@MODULEDIR@/sppp_subr/sppp_subr.kmod base-kernel-modules kmod
./@MODULEDIR@/suser base-kernel-modules kmod
./@MODULEDIR@/suser/suser.kmod base-kernel-modules kmod
./@MODULEDIR@/swcrypto base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.172 src/sys/modules/Makefile:1.173
--- src/sys/modules/Makefile:1.172 Sat Aug 6 12:44:03 2016
+++ src/sys/modules/Makefile Sat Aug 6 22:03:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.172 2016/08/06 12:44:03 christos Exp $
+# $NetBSD: Makefile,v 1.173 2016/08/06 22:03:45 pgoyette Exp $
.include <bsd.own.mk>
@@ -99,6 +99,7 @@ SUBDIR+= skipjack
SUBDIR+= slcompress
SUBDIR+= smbfs
SUBDIR+= spdmem
+SUBDIR+= sppp_subr
SUBDIR+= sysmon
SUBDIR+= sysmon_envsys
SUBDIR+= sysmon_power
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.146 src/sys/net/if_spppsubr.c:1.147
--- src/sys/net/if_spppsubr.c:1.146 Thu Jul 7 09:32:02 2016
+++ src/sys/net/if_spppsubr.c Sat Aug 6 22:03:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.146 2016/07/07 09:32:02 ozaki-r Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.147 2016/08/06 22:03:45 pgoyette Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.146 2016/07/07 09:32:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.147 2016/08/06 22:03:45 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#include <sys/inttypes.h>
#include <sys/kauth.h>
#include <sys/cprng.h>
+#include <sys/module.h>
#include <net/if.h>
#include <net/netisr.h>
@@ -5592,3 +5593,23 @@ sppp_null(struct sppp *unused)
* hilit-auto-highlight-maxout: 120000
* End:
*/
+
+/*
+ * Module glue
+ */
+MODULE(MODULE_CLASS_MISC, sppp_subr, NULL);
+
+static int
+sppp_subr_modcmd(modcmd_t cmd, void *arg)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ case MODULE_CMD_FINI:
+ return 0;
+ case MODULE_CMD_STAT:
+ case MODULE_CMD_AUTOUNLOAD:
+ default:
+ return ENOTTY;
+ }
+}
+
Added files:
Index: src/sys/modules/sppp_subr/Makefile
diff -u /dev/null src/sys/modules/sppp_subr/Makefile:1.1
--- /dev/null Sat Aug 6 22:03:45 2016
+++ src/sys/modules/sppp_subr/Makefile Sat Aug 6 22:03:45 2016
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2016/08/06 22:03:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/net
+
+KMOD= sppp_subr
+SRCS= if_spppsubr.c
+
+CPPFLAGS+= -DINET
+CPPFLAGS+= -DINET6
+#CPPFLAGS+= -DIPV6CP_MYIFID_DYN # Will not build if this is enabled!
+
+.include <bsd.kmodule.mk>
