diff options
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.h | 3 | ||||
| -rw-r--r-- | sys/net/if_disc.c | 10 | ||||
| -rw-r--r-- | sys/net/if_loop.c | 12 | ||||
| -rw-r--r-- | sys/net/if_ppp.c | 13 | ||||
| -rw-r--r-- | sys/net/if_sl.c | 12 | ||||
| -rw-r--r-- | sys/net/if_slvar.h | 3 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 15 |
7 files changed, 37 insertions, 31 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index cceba85..6283851 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $Id: if.h,v 1.19 1995/07/09 08:12:27 joerg Exp $ + * $Id: if.h,v 1.20 1995/08/16 16:13:39 bde Exp $ */ #ifndef _NET_IF_H_ @@ -389,7 +389,6 @@ void ifafree __P((struct ifaddr *)); void link_rtrequest __P((int, struct rtentry *, struct sockaddr *)); int loioctl __P((struct ifnet *, int, caddr_t)); -void loopattach __P((void)); int looutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *)); void lortrequest __P((int, struct rtentry *, struct sockaddr *)); diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c index 7e80531..8b4ed6e 100644 --- a/sys/net/if_disc.c +++ b/sys/net/if_disc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $Id: if_disc.c,v 1.3 1995/03/20 19:20:39 wollman Exp $ + * $Id: if_disc.c,v 1.4 1995/05/30 08:08:01 rgrimes Exp $ */ /* @@ -80,6 +80,9 @@ #define DSMTU 65532 #endif +static void discattach __P((caddr_t udata)); +PSEUDO_SET(discattach, if_disc); + static struct ifnet dsif; static int dsoutput(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); @@ -87,7 +90,8 @@ static int dsioctl(struct ifnet *, int, caddr_t); /* ARGSUSED */ static void -discattach(void) +discattach(udata) + caddr_t udata; { register struct ifnet *ifp = &dsif; @@ -105,8 +109,6 @@ discattach(void) #endif } -PSEUDO_SET(discattach, if_disc); - static int dsoutput(ifp, m, dst, rt) struct ifnet *ifp; diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 7673f7e..f548661 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $Id: if_loop.c,v 1.9 1995/04/26 18:10:45 pst Exp $ + * $Id: if_loop.c,v 1.10 1995/05/30 08:08:06 rgrimes Exp $ */ /* @@ -75,6 +75,9 @@ #include "bpfilter.h" +static void loopattach __P((caddr_t)); +PSEUDO_SET(loopattach, if_loop); + #ifdef TINY_LOMTU #define LOMTU (1024+512) #else @@ -84,8 +87,9 @@ struct ifnet loif[NLOOP]; /* ARGSUSED */ -void -loopattach(void) +static void +loopattach(udata) + caddr_t udata; { register struct ifnet *ifp; register int i = 0; @@ -108,8 +112,6 @@ loopattach(void) } } -PSEUDO_SET(loopattach, if_loop); - int looutput(ifp, m, dst, rt) struct ifnet *ifp; diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 6b7d3bb..8b9171f 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id: if_ppp.c,v 1.18 1995/07/31 21:01:34 bde Exp $ */ +/* $Id: if_ppp.c,v 1.19 1995/07/31 21:54:46 bde Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ #include "ppp.h" @@ -123,6 +123,9 @@ #include <net/if_ppp.h> #include <machine/cpu.h> +static void pppattach __P((caddr_t)); +PSEUDO_SET(pppattach, if_ppp); + /* This is a FreeBSD-2.x kernel. */ #define CCOUNT(q) ((q)->c_cc) @@ -131,7 +134,6 @@ struct ppp_softc ppp_softc[NPPP]; -void pppattach __P((void)); int pppopen __P((dev_t dev, struct tty *tp)); int pppclose __P((struct tty *tp, int flag)); int pppread __P((struct tty *tp, struct uio *uio, int flag)); @@ -188,8 +190,9 @@ static u_short interactive_ports[8] = { /* * Called from boot code to establish ppp interfaces. */ -void -pppattach() +static void +pppattach(udata) + caddr_t udata; { register struct ppp_softc *sc; register int i = 0; @@ -1635,6 +1638,4 @@ pppdumpb(b, l) printf("%s\n", buf); } -PSEUDO_SET(pppattach, if_ppp); - #endif /* NPPP > 0 */ diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index 0b33a2d..28e8305 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_sl.c 8.6 (Berkeley) 2/1/94 - * $Id: if_sl.c,v 1.27 1995/07/29 13:39:46 bde Exp $ + * $Id: if_sl.c,v 1.28 1995/07/31 21:01:36 bde Exp $ */ /* @@ -110,6 +110,9 @@ Huh? Slip without inet? #include <net/bpf.h> #endif +static void slattach __P((caddr_t)); +PSEUDO_SET(slattach, if_sl); + /* * SLRMAX is a hard limit on input packet size. To simplify the code * and improve performance, we require that packets fit in an mbuf @@ -195,8 +198,9 @@ static struct linesw slipdisc = /* * Called from boot code to establish sl interfaces. */ -void -slattach() +static void +slattach(udata) + caddr_t udata; { register struct sl_softc *sc; register int i = 0; @@ -222,8 +226,6 @@ slattach() } } -PSEUDO_SET(slattach, if_sl); - static int slinit(sc) register struct sl_softc *sc; diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h index ade190f..f3e22c6 100644 --- a/sys/net/if_slvar.h +++ b/sys/net/if_slvar.h @@ -32,7 +32,7 @@ * * @(#)if_slvar.h 8.3 (Berkeley) 2/1/94 * - * $Id: if_slvar.h,v 1.5 1995/03/30 20:43:32 ache Exp $ + * $Id: if_slvar.h,v 1.6 1995/05/30 08:08:13 rgrimes Exp $ */ #ifndef _NET_IF_SLVAR_H_ @@ -75,7 +75,6 @@ struct sl_softc { #define SC_AUTOCOMP IFF_LINK2 /* auto-enable TCP compression */ #ifdef KERNEL -void slattach __P((void)); int slclose __P((struct tty *,int)); int slinput __P((int, struct tty *)); int slioctl __P((struct ifnet *, int, caddr_t)); diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 80f5ce2..82a3e15 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -62,6 +62,11 @@ #include <net/if_tun.h> +#ifdef __FreeBSD__ +static void tunattach __P((caddr_t)); +PSEUDO_SET(tunattach, if_tun); +#endif + #define TUNDEBUG if (tundebug) printf int tundebug = 0; @@ -76,7 +81,6 @@ d_rdwr_t tunwrite; d_ioctl_t tunioctl; int tunifioctl __P((struct ifnet *, int, caddr_t)); d_select_t tunselect; -void tunattach __P((void)); static struct cdevsw tuncdevsw = { tunopen, tunclose, tunread, tunwrite, @@ -86,8 +90,9 @@ extern dev_t tuncdev; static int tuninit __P((int)); -void -tunattach(void) +static void +tunattach(udata) + caddr_t udata; { register int i; struct ifnet *ifp; @@ -121,10 +126,6 @@ tunattach(void) } } -#ifdef __FreeBSD__ -PSEUDO_SET(tunattach, if_tun); -#endif - /* * tunnel open - must be superuser & the device must be * configured in |
