Module Name: src
Committed By: uebayasi
Date: Thu Aug 20 11:18:53 UTC 2015
Modified Files:
src/sys/net: if_ppp.c if_ppp.h if_sl.c
Log Message:
Honor pseudo attach decl generated by config(1).
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/net/if_ppp.c
cvs rdiff -u -r1.25 -r1.26 src/sys/net/if_ppp.h
cvs rdiff -u -r1.119 -r1.120 src/sys/net/if_sl.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_ppp.c
diff -u src/sys/net/if_ppp.c:1.147 src/sys/net/if_ppp.c:1.148
--- src/sys/net/if_ppp.c:1.147 Mon Apr 20 10:19:54 2015
+++ src/sys/net/if_ppp.c Thu Aug 20 11:18:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.147 2015/04/20 10:19:54 roy Exp $ */
+/* $NetBSD: if_ppp.c,v 1.148 2015/08/20 11:18:53 uebayasi Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.147 2015/04/20 10:19:54 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.148 2015/08/20 11:18:53 uebayasi Exp $");
#include "ppp.h"
@@ -165,6 +165,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1
#include <net/ppp-comp.h>
#endif
+#include "ioconf.h"
+
static int pppsioctl(struct ifnet *, u_long, void *);
static void ppp_requeue(struct ppp_softc *);
static void ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd);
@@ -224,7 +226,7 @@ static void ppp_compressor_rele(struct c
* Called from boot code to establish ppp interfaces.
*/
void
-pppattach(void)
+pppattach(int n __unused)
{
extern struct linesw ppp_disc;
Index: src/sys/net/if_ppp.h
diff -u src/sys/net/if_ppp.h:1.25 src/sys/net/if_ppp.h:1.26
--- src/sys/net/if_ppp.h:1.25 Sat Nov 29 23:15:20 2008
+++ src/sys/net/if_ppp.h Thu Aug 20 11:18:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.h,v 1.25 2008/11/29 23:15:20 cube Exp $ */
+/* $NetBSD: if_ppp.h,v 1.26 2015/08/20 11:18:53 uebayasi Exp $ */
/* Id: if_ppp.h,v 1.16 1997/04/30 05:46:04 paulus Exp */
/*
@@ -172,8 +172,6 @@ struct ppp_rawin {
#endif
#if defined(_KERNEL) || defined(KERNEL)
-void pppattach(void);
-
struct compressor;
int ppp_register_compressor(struct compressor *, size_t);
int ppp_unregister_compressor(struct compressor *, size_t);
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.119 src/sys/net/if_sl.c:1.120
--- src/sys/net/if_sl.c:1.119 Thu Jun 5 23:48:16 2014
+++ src/sys/net/if_sl.c Thu Aug 20 11:18:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sl.c,v 1.119 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: if_sl.c,v 1.120 2015/08/20 11:18:53 uebayasi Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.119 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.120 2015/08/20 11:18:53 uebayasi Exp $");
#include "opt_inet.h"
@@ -105,6 +105,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.
#include <sys/time.h>
#include <net/bpf.h>
+#include "ioconf.h"
+
/*
* SLMAX is a hard limit on input packet size. To simplify the code
* and improve performance, we require that packets fit in an mbuf
@@ -211,10 +213,8 @@ static struct linesw slip_disc = {
.l_poll = ttyerrpoll
};
-void slattach(void);
-
void
-slattach(void)
+slattach(int n __unused)
{
if (ttyldisc_attach(&slip_disc) != 0)
