Module Name:    src
Committed By:   pgoyette
Date:           Mon Aug  8 02:50:05 UTC 2016

Modified Files:
        src/sys/net: if_pppoe.c

Log Message:
Don't try to set-up our sysctl sub-tree if we're built-in - this will
happen automatically (via "registration" of the setup function in a
link-set), and if we're not a module, the SYSCTL_SETUP_PROTO() will
not have declared a function prototype!


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/net/if_pppoe.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.114 src/sys/net/if_pppoe.c:1.115
--- src/sys/net/if_pppoe.c:1.114	Sun Aug  7 17:38:34 2016
+++ src/sys/net/if_pppoe.c	Mon Aug  8 02:50:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.114 2016/08/07 17:38:34 christos Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.115 2016/08/08 02:50:05 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.114 2016/08/07 17:38:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.115 2016/08/08 02:50:05 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
@@ -238,7 +238,9 @@ pppoeinit(void)
 
 	pppoe_softintr = softint_establish(SOFTINT_NET, pppoe_softintr_handler,
 	    NULL);
+#ifdef _MODULE
 	sysctl_net_pppoe_setup(&pppoe_sysctl_clog);
+#endif
 }
 
 static int

Reply via email to