From 158abb01b4d99207a276117949c1d7178bbe8045 Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Tue, 26 Aug 2003 20:49:49 +0000 Subject: [PATCH] __P() removal --- sys/net/bpf.c | 34 +++---- sys/net/bpf.h | 18 ++-- sys/net/bpf_filter.c | 6 +- sys/net/bsd_comp.c | 40 ++++----- sys/net/disc/if_disc.c | 4 +- sys/net/ethernet.h | 12 +-- sys/net/faith/if_faith.c | 18 ++-- sys/net/faith/if_faith.h | 4 +- sys/net/gif/if_gif.c | 8 +- sys/net/gif/if_gif.h | 18 ++-- sys/net/i4b/driver/i4b_ctl.c | 12 +-- sys/net/i4b/driver/i4b_ipr.c | 4 +- sys/net/i4b/driver/i4b_rbch.c | 18 ++-- sys/net/i4b/driver/i4b_trace.c | 14 +-- sys/net/i4b/layer2/i4b_l2fsm.c | 152 ++++++++++++++++---------------- sys/net/i4b/layer4/i4b_i4bdrv.c | 18 ++-- sys/net/if.c | 20 ++--- sys/net/if.h | 10 +-- sys/net/if_arc.h | 24 ++--- sys/net/if_arcsubr.c | 8 +- sys/net/if_atm.h | 12 +-- sys/net/if_dl.h | 6 +- sys/net/if_fddisubr.c | 6 +- sys/net/if_loop.c | 12 +-- sys/net/if_media.c | 8 +- sys/net/intrq.h | 4 +- sys/net/ip6fw/ip6_fw.c | 36 ++++---- sys/net/ip6fw/ip6_fw.h | 8 +- sys/net/ipfw/ip_fw.h | 4 +- sys/net/iso88025.h | 10 +-- sys/net/net_osdep.h | 4 +- sys/net/netisr.h | 8 +- sys/net/ppp/if_ppp.c | 20 ++--- sys/net/ppp/if_pppvar.h | 28 +++--- sys/net/ppp_layer/ppp_comp.h | 36 ++++---- sys/net/ppp_layer/ppp_deflate.c | 38 ++++---- sys/net/ppp_layer/ppp_defs.h | 9 +- sys/net/ppp_layer/ppp_tty.c | 38 ++++---- sys/net/radix.c | 28 +++--- sys/net/radix.h | 50 +++++------ sys/net/raw_cb.h | 16 ++-- sys/net/route.c | 12 +-- sys/net/route.h | 46 +++++----- sys/net/rtsock.c | 18 ++-- sys/net/sl/if_sl.c | 24 ++--- sys/net/slcompress.h | 14 +-- sys/net/stf/if_stf.c | 24 ++--- sys/net/stf/if_stf.h | 4 +- sys/net/tap/if_tap.c | 12 +-- sys/net/tun/if_tun.c | 14 +-- 50 files changed, 492 insertions(+), 499 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 593d24a327..9b9777c468 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -38,7 +38,7 @@ * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * * $FreeBSD: src/sys/net/bpf.c,v 1.59.2.12 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/bpf.c,v 1.7 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/bpf.c,v 1.8 2003/08/26 20:49:47 rob Exp $ */ #include "use_bpf.h" @@ -114,21 +114,21 @@ SYSCTL_INT(_debug, OID_AUTO, bpf_maxbufsize, CTLFLAG_RW, */ static struct bpf_if *bpf_iflist; -static int bpf_allocbufs __P((struct bpf_d *)); -static void bpf_attachd __P((struct bpf_d *d, struct bpf_if *bp)); -static void bpf_detachd __P((struct bpf_d *d)); -static void bpf_freed __P((struct bpf_d *)); -static void bpf_mcopy __P((const void *, void *, size_t)); -static int bpf_movein __P((struct uio *, int, - struct mbuf **, struct sockaddr *, int *)); -static int bpf_setif __P((struct bpf_d *, struct ifreq *)); -static void bpf_timed_out __P((void *)); +static int bpf_allocbufs (struct bpf_d *); +static void bpf_attachd (struct bpf_d *d, struct bpf_if *bp); +static void bpf_detachd (struct bpf_d *d); +static void bpf_freed (struct bpf_d *); +static void bpf_mcopy (const void *, void *, size_t); +static int bpf_movein (struct uio *, int, + struct mbuf **, struct sockaddr *, int *); +static int bpf_setif (struct bpf_d *, struct ifreq *); +static void bpf_timed_out (void *); static inline void - bpf_wakeup __P((struct bpf_d *)); -static void catchpacket __P((struct bpf_d *, u_char *, u_int, - u_int, void (*)(const void *, void *, size_t))); -static void reset_d __P((struct bpf_d *)); -static int bpf_setf __P((struct bpf_d *, struct bpf_program *)); + bpf_wakeup (struct bpf_d *); +static void catchpacket (struct bpf_d *, u_char *, u_int, + u_int, void (*)(const void *, void *, size_t)); +static void reset_d (struct bpf_d *); +static int bpf_setf (struct bpf_d *, struct bpf_program *); static d_open_t bpfopen; static d_close_t bpfclose; @@ -1201,7 +1201,7 @@ catchpacket(d, pkt, pktlen, snaplen, cpfn) struct bpf_d *d; u_char *pkt; u_int pktlen, snaplen; - void (*cpfn) __P((const void *, void *, size_t)); + void (*cpfn) (const void *, void *, size_t); { struct bpf_hdr *hp; int totlen, curlen; @@ -1395,7 +1395,7 @@ bpfdetach(ifp) splx(s); } -static void bpf_drvinit __P((void *unused)); +static void bpf_drvinit (void *unused); static void bpf_drvinit(unused) diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 20df324a19..98cf5f19b4 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -39,7 +39,7 @@ * @(#)bpf.h 1.34 (LBL) 6/16/96 * * $FreeBSD: src/sys/net/bpf.h,v 1.21.2.4 2002/07/05 14:40:00 fenner Exp $ - * $DragonFly: src/sys/net/bpf.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ + * $DragonFly: src/sys/net/bpf.h,v 1.3 2003/08/26 20:49:47 rob Exp $ */ #ifndef _NET_BPF_H_ @@ -341,14 +341,14 @@ struct bpf_insn { #define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k } #ifdef _KERNEL -int bpf_validate __P((const struct bpf_insn *, int)); -void bpf_tap __P((struct ifnet *, u_char *, u_int)); -void bpf_mtap __P((struct ifnet *, struct mbuf *)); -void bpfattach __P((struct ifnet *, u_int, u_int)); -void bpfdetach __P((struct ifnet *)); - -void bpfilterattach __P((int)); -u_int bpf_filter __P((const struct bpf_insn *, u_char *, u_int, u_int)); +int bpf_validate (const struct bpf_insn *, int); +void bpf_tap (struct ifnet *, u_char *, u_int); +void bpf_mtap (struct ifnet *, struct mbuf *); +void bpfattach (struct ifnet *, u_int, u_int); +void bpfdetach (struct ifnet *); + +void bpfilterattach (int); +u_int bpf_filter (const struct bpf_insn *, u_char *, u_int, u_int); #endif /* diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c index 7c2a2219a1..cc1ce7f960 100644 --- a/sys/net/bpf_filter.c +++ b/sys/net/bpf_filter.c @@ -38,7 +38,7 @@ * @(#)bpf_filter.c 8.1 (Berkeley) 6/10/93 * * $FreeBSD: src/sys/net/bpf_filter.c,v 1.17 1999/12/29 04:38:31 peter Exp $ - * $DragonFly: src/sys/net/bpf_filter.c,v 1.3 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/bpf_filter.c,v 1.4 2003/08/26 20:49:47 rob Exp $ */ #include @@ -84,8 +84,8 @@ } \ } -static u_int16_t m_xhalf __P((struct mbuf *m, bpf_u_int32 k, int *err)); -static u_int32_t m_xword __P((struct mbuf *m, bpf_u_int32 k, int *err)); +static u_int16_t m_xhalf (struct mbuf *m, bpf_u_int32 k, int *err); +static u_int32_t m_xword (struct mbuf *m, bpf_u_int32 k, int *err); static u_int32_t m_xword(m, k, err) diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c index c021f3276d..5a79bf059e 100644 --- a/sys/net/bsd_comp.c +++ b/sys/net/bsd_comp.c @@ -41,7 +41,7 @@ * This version is for use with mbufs on BSD-derived systems. * * $FreeBSD: src/sys/net/bsd_comp.c,v 1.11.2.1 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/bsd_comp.c,v 1.3 2003/08/07 21:54:30 dillon Exp $ + * $DragonFly: src/sys/net/bsd_comp.c,v 1.4 2003/08/26 20:49:47 rob Exp $ */ #include @@ -127,26 +127,26 @@ struct bsd_db { #define BSD_OVHD 2 /* BSD compress overhead/packet */ #define BSD_INIT_BITS BSD_MIN_BITS -static void bsd_clear __P((struct bsd_db *db)); -static int bsd_check __P((struct bsd_db *db)); -static void *bsd_alloc __P((u_char *options, int opt_len, int decomp)); -static int bsd_init __P((struct bsd_db *db, u_char *options, int opt_len, +static void bsd_clear (struct bsd_db *db); +static int bsd_check (struct bsd_db *db); +static void *bsd_alloc (u_char *options, int opt_len, int decomp); +static int bsd_init (struct bsd_db *db, u_char *options, int opt_len, int unit, int hdrlen, int mru, int debug, - int decomp)); -static void *bsd_comp_alloc __P((u_char *options, int opt_len)); -static void *bsd_decomp_alloc __P((u_char *options, int opt_len)); -static void bsd_free __P((void *state)); -static int bsd_comp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); -static int bsd_decomp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); -static int bsd_compress __P((void *state, struct mbuf **mret, - struct mbuf *mp, int slen, int maxolen)); -static void bsd_incomp __P((void *state, struct mbuf *dmsg)); -static int bsd_decompress __P((void *state, struct mbuf *cmp, - struct mbuf **dmpp)); -static void bsd_reset __P((void *state)); -static void bsd_comp_stats __P((void *state, struct compstat *stats)); + int decomp); +static void *bsd_comp_alloc (u_char *options, int opt_len); +static void *bsd_decomp_alloc (u_char *options, int opt_len); +static void bsd_free (void *state); +static int bsd_comp_init (void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); +static int bsd_decomp_init (void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); +static int bsd_compress (void *state, struct mbuf **mret, + struct mbuf *mp, int slen, int maxolen); +static void bsd_incomp (void *state, struct mbuf *dmsg); +static int bsd_decompress (void *state, struct mbuf *cmp, + struct mbuf **dmpp); +static void bsd_reset (void *state); +static void bsd_comp_stats (void *state, struct compstat *stats); /* * Procedures exported to if_ppp.c. diff --git a/sys/net/disc/if_disc.c b/sys/net/disc/if_disc.c index 4a64c0176c..dc2172dfba 100644 --- a/sys/net/disc/if_disc.c +++ b/sys/net/disc/if_disc.c @@ -32,7 +32,7 @@ * * From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_disc.c,v 1.26.2.2 2001/12/20 10:30:16 ru Exp $ - * $DragonFly: src/sys/net/disc/if_disc.c,v 1.3 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/disc/if_disc.c,v 1.4 2003/08/26 20:49:47 rob Exp $ */ /* @@ -62,7 +62,7 @@ #define DSMTU 65532 #endif -static void discattach __P((void)); +static void discattach (void); static struct ifnet discif; static int discoutput(struct ifnet *, struct mbuf *, struct sockaddr *, diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 67b8292e73..0edb39546d 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -2,7 +2,7 @@ * Fundamental constants relating to ethernet. * * $FreeBSD: src/sys/net/ethernet.h,v 1.12.2.8 2002/12/01 14:03:09 sobomax Exp $ - * $DragonFly: src/sys/net/ethernet.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ + * $DragonFly: src/sys/net/ethernet.h,v 1.3 2003/08/26 20:49:47 rob Exp $ * */ @@ -373,11 +373,11 @@ extern int (*vlan_input_tag_p)(struct ether_header *eh, struct mbuf *m, * Ethernet address conversion/parsing routines. */ __BEGIN_DECLS -struct ether_addr *ether_aton __P((const char *)); -int ether_hostton __P((const char *, struct ether_addr *)); -int ether_line __P((const char *, struct ether_addr *, char *)); -char *ether_ntoa __P((const struct ether_addr *)); -int ether_ntohost __P((char *, const struct ether_addr *)); +struct ether_addr *ether_aton (const char *); +int ether_hostton (const char *, struct ether_addr *); +int ether_line (const char *, struct ether_addr *, char *); +char *ether_ntoa (const struct ether_addr *); +int ether_ntohost (char *, const struct ether_addr *); __END_DECLS #endif /* !_KERNEL */ diff --git a/sys/net/faith/if_faith.c b/sys/net/faith/if_faith.c index 7eeb010a53..10f0c8e996 100644 --- a/sys/net/faith/if_faith.c +++ b/sys/net/faith/if_faith.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_faith.c,v 1.3.2.6 2002/04/28 05:40:25 suz Exp $ - * $DragonFly: src/sys/net/faith/if_faith.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/faith/if_faith.c,v 1.4 2003/08/26 20:49:47 rob Exp $ */ /* * derived from @@ -97,20 +97,20 @@ struct faith_softc { LIST_ENTRY(faith_softc) sc_list; }; -static int faithioctl __P((struct ifnet *, u_long, caddr_t)); -int faithoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); -static void faithrtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); -static int faithprefix __P((struct in6_addr *)); +static int faithioctl (struct ifnet *, u_long, caddr_t); +int faithoutput (struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); +static void faithrtrequest (int, struct rtentry *, struct rt_addrinfo *); +static int faithprefix (struct in6_addr *); -static int faithmodevent __P((module_t, int, void *)); +static int faithmodevent (module_t, int, void *); static MALLOC_DEFINE(M_FAITH, FAITHNAME, "Firewall Assisted Tunnel Interface"); static struct rman faithunits[1]; LIST_HEAD(, faith_softc) faith_softc_list; -int faith_clone_create __P((struct if_clone *, int *)); -void faith_clone_destroy __P((struct ifnet *)); +int faith_clone_create (struct if_clone *, int *); +void faith_clone_destroy (struct ifnet *); struct if_clone faith_cloner = IF_CLONE_INITIALIZER(FAITHNAME, faith_clone_create, faith_clone_destroy); diff --git a/sys/net/faith/if_faith.h b/sys/net/faith/if_faith.h index ca3ecce03d..f8f1f79b8e 100644 --- a/sys/net/faith/if_faith.h +++ b/sys/net/faith/if_faith.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_faith.h,v 1.1.2.2 2001/07/05 14:46:25 ume Exp $ */ -/* $DragonFly: src/sys/net/faith/if_faith.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ */ +/* $DragonFly: src/sys/net/faith/if_faith.h,v 1.3 2003/08/26 20:49:47 rob Exp $ */ /* $KAME: if_faith.h,v 1.1 2000/07/26 05:49:21 itojun Exp $ */ /* @@ -37,7 +37,7 @@ #ifdef _KERNEL #ifdef INET6 struct in6_addr; -int faithprefix __P((struct in6_addr *)); +int faithprefix (struct in6_addr *); #endif #endif diff --git a/sys/net/gif/if_gif.c b/sys/net/gif/if_gif.c index 2696cfb2be..1927ee0bb2 100644 --- a/sys/net/gif/if_gif.c +++ b/sys/net/gif/if_gif.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_gif.c,v 1.4.2.15 2002/11/08 16:57:13 ume Exp $ */ -/* $DragonFly: src/sys/net/gif/if_gif.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ */ +/* $DragonFly: src/sys/net/gif/if_gif.c,v 1.5 2003/08/26 20:49:48 rob Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /* @@ -91,13 +91,13 @@ static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface"); static struct rman gifunits[1]; LIST_HEAD(, gif_softc) gif_softc_list; -int gif_clone_create __P((struct if_clone *, int *)); -void gif_clone_destroy __P((struct ifnet *)); +int gif_clone_create (struct if_clone *, int *); +void gif_clone_destroy (struct ifnet *); struct if_clone gif_cloner = IF_CLONE_INITIALIZER("gif", gif_clone_create, gif_clone_destroy); -static int gifmodevent __P((module_t, int, void *)); +static int gifmodevent (module_t, int, void *); SYSCTL_DECL(_net_link); SYSCTL_NODE(_net_link, IFT_GIF, gif, CTLFLAG_RW, 0, diff --git a/sys/net/gif/if_gif.h b/sys/net/gif/if_gif.h index 568ec91657..cd9904c9ff 100644 --- a/sys/net/gif/if_gif.h +++ b/sys/net/gif/if_gif.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_gif.h,v 1.2.2.5 2002/11/08 16:23:08 ume Exp $ */ -/* $DragonFly: src/sys/net/gif/if_gif.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ */ +/* $DragonFly: src/sys/net/gif/if_gif.h,v 1.3 2003/08/26 20:49:48 rob Exp $ */ /* $KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $ */ /* @@ -75,13 +75,13 @@ struct gif_softc { #define GIF_MTU_MAX (8192) /* Maximum MTU */ /* Prototypes */ -void gifattach0 __P((struct gif_softc *)); -void gif_input __P((struct mbuf *, int, struct ifnet *)); -int gif_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *)); -int gif_ioctl __P((struct ifnet *, u_long, caddr_t)); -int gif_set_tunnel __P((struct ifnet *, struct sockaddr *, struct sockaddr *)); -void gif_delete_tunnel __P((struct ifnet *)); -int gif_encapcheck __P((const struct mbuf *, int, int, void *)); +void gifattach0 (struct gif_softc *); +void gif_input (struct mbuf *, int, struct ifnet *); +int gif_output (struct ifnet *, struct mbuf *, + struct sockaddr *, struct rtentry *); +int gif_ioctl (struct ifnet *, u_long, caddr_t); +int gif_set_tunnel (struct ifnet *, struct sockaddr *, struct sockaddr *); +void gif_delete_tunnel (struct ifnet *); +int gif_encapcheck (const struct mbuf *, int, int, void *); #endif /* _NET_IF_GIF_H_ */ diff --git a/sys/net/i4b/driver/i4b_ctl.c b/sys/net/i4b/driver/i4b_ctl.c index 7dd4346c93..095471baa5 100644 --- a/sys/net/i4b/driver/i4b_ctl.c +++ b/sys/net/i4b/driver/i4b_ctl.c @@ -30,7 +30,7 @@ * $Id: i4b_ctl.c,v 1.37 2000/05/31 08:04:43 hm Exp $ * * $FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_ctl.c,v 1.5 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_ctl.c,v 1.6 2003/08/26 20:49:48 rob Exp $ * * last edit-date: [Sat Aug 11 18:06:38 2001] * @@ -143,13 +143,13 @@ static void *devfs_token; #ifndef __FreeBSD__ #define PDEVSTATIC /* */ -void i4bctlattach __P((void)); -int i4bctlopen __P((dev_t dev, int flag, int fmt, struct proc *p)); -int i4bctlclose __P((dev_t dev, int flag, int fmt, struct proc *p)); +void i4bctlattach (void); +int i4bctlopen (dev_t dev, int flag, int fmt, struct proc *p); +int i4bctlclose (dev_t dev, int flag, int fmt, struct proc *p); #ifdef __bsdi__ -int i4bctlioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)); +int i4bctlioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p); #else -int i4bctlioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); +int i4bctlioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); #endif #endif /* !FreeBSD */ diff --git a/sys/net/i4b/driver/i4b_ipr.c b/sys/net/i4b/driver/i4b_ipr.c index c2dbc83643..f6559ec746 100644 --- a/sys/net/i4b/driver/i4b_ipr.c +++ b/sys/net/i4b/driver/i4b_ipr.c @@ -28,7 +28,7 @@ * --------------------------------------------------------- * * $FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.8.2.3 2001/10/27 15:48:17 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_ipr.c,v 1.6 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_ipr.c,v 1.7 2003/08/26 20:49:48 rob Exp $ * * last edit-date: [Fri Oct 26 19:32:38 2001] * @@ -243,7 +243,7 @@ PDEVSTATIC void i4biprattach(void *); PSEUDO_SET(i4biprattach, i4b_ipr); static int i4biprioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, caddr_t data); #else -PDEVSTATIC void i4biprattach __P((void)); +PDEVSTATIC void i4biprattach (void); static int i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data); #endif diff --git a/sys/net/i4b/driver/i4b_rbch.c b/sys/net/i4b/driver/i4b_rbch.c index 2db4954813..ba7d735383 100644 --- a/sys/net/i4b/driver/i4b_rbch.c +++ b/sys/net/i4b/driver/i4b_rbch.c @@ -28,7 +28,7 @@ * --------------------------------------------------- * * $FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.7 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.8 2003/08/26 20:49:48 rob Exp $ * * last edit-date: [Sat Aug 11 18:06:57 2001] * @@ -156,16 +156,16 @@ static void rbch_clrq(int unit); #ifndef __FreeBSD__ #define PDEVSTATIC /* - not static - */ #define IOCTL_CMD_T u_long -void i4brbchattach __P((void)); -int i4brbchopen __P((dev_t dev, int flag, int fmt, struct proc *p)); -int i4brbchclose __P((dev_t dev, int flag, int fmt, struct proc *p)); -int i4brbchread __P((dev_t dev, struct uio *uio, int ioflag)); -int i4brbchwrite __P((dev_t dev, struct uio *uio, int ioflag)); -int i4brbchioctl __P((dev_t dev, IOCTL_CMD_T cmd, caddr_t arg, int flag, struct proc* pr)); +void i4brbchattach (void); +int i4brbchopen (dev_t dev, int flag, int fmt, struct proc *p); +int i4brbchclose (dev_t dev, int flag, int fmt, struct proc *p); +int i4brbchread (dev_t dev, struct uio *uio, int ioflag); +int i4brbchwrite (dev_t dev, struct uio *uio, int ioflag); +int i4brbchioctl (dev_t dev, IOCTL_CMD_T cmd, caddr_t arg, int flag, struct proc* pr); #ifdef OS_USES_POLL -int i4brbchpoll __P((dev_t dev, int events, struct proc *p)); +int i4brbchpoll (dev_t dev, int events, struct proc *p); #else -PDEVSTATIC int i4brbchselect __P((dev_t dev, int rw, struct proc *p)); +PDEVSTATIC int i4brbchselect (dev_t dev, int rw, struct proc *p); #endif #endif diff --git a/sys/net/i4b/driver/i4b_trace.c b/sys/net/i4b/driver/i4b_trace.c index 2575472e8f..538762b2f7 100644 --- a/sys/net/i4b/driver/i4b_trace.c +++ b/sys/net/i4b/driver/i4b_trace.c @@ -30,7 +30,7 @@ * last edit-date: [Sat Aug 11 18:07:15 2001] * * $FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.9.2.3 2001/08/12 16:22:48 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.6 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.7 2003/08/26 20:49:48 rob Exp $ * * NOTE: the code assumes that SPLI4B >= splimp ! * @@ -101,15 +101,15 @@ static int outunit = -1; #ifndef __FreeBSD__ #define PDEVSTATIC /* - not static - */ -void i4btrcattach __P((void)); -int i4btrcopen __P((dev_t dev, int flag, int fmt, struct proc *p)); -int i4btrcclose __P((dev_t dev, int flag, int fmt, struct proc *p)); -int i4btrcread __P((dev_t dev, struct uio * uio, int ioflag)); +void i4btrcattach (void); +int i4btrcopen (dev_t dev, int flag, int fmt, struct proc *p); +int i4btrcclose (dev_t dev, int flag, int fmt, struct proc *p); +int i4btrcread (dev_t dev, struct uio * uio, int ioflag); #ifdef __bsdi__ -int i4btrcioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)); +int i4btrcioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p); #else -int i4btrcioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); +int i4btrcioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); #endif #endif diff --git a/sys/net/i4b/layer2/i4b_l2fsm.c b/sys/net/i4b/layer2/i4b_l2fsm.c index 7f754fbc64..98faaa2022 100644 --- a/sys/net/i4b/layer2/i4b_l2fsm.c +++ b/sys/net/i4b/layer2/i4b_l2fsm.c @@ -30,7 +30,7 @@ * $Id: i4b_l2fsm.c,v 1.22 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_l2fsm.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_l2fsm.c,v 1.4 2003/08/26 20:49:48 rob Exp $ * * last edit-date: [Tue May 30 15:48:20 2000] * @@ -110,80 +110,80 @@ static char *l2event_text[N_EVENTS] = { }; #endif -static void F_TU01 __P((l2_softc_t *)); -static void F_TU03 __P((l2_softc_t *)); - -static void F_TA03 __P((l2_softc_t *)); -static void F_TA04 __P((l2_softc_t *)); -static void F_TA05 __P((l2_softc_t *)); - -static void F_TE03 __P((l2_softc_t *)); -static void F_TE04 __P((l2_softc_t *)); -static void F_TE05 __P((l2_softc_t *)); - -static void F_T01 __P((l2_softc_t *)); -static void F_T05 __P((l2_softc_t *)); -static void F_T06 __P((l2_softc_t *)); -static void F_T07 __P((l2_softc_t *)); -static void F_T08 __P((l2_softc_t *)); -static void F_T09 __P((l2_softc_t *)); -static void F_T10 __P((l2_softc_t *)); -static void F_T13 __P((l2_softc_t *)); - -static void F_AE01 __P((l2_softc_t *)); -static void F_AE05 __P((l2_softc_t *)); -static void F_AE06 __P((l2_softc_t *)); -static void F_AE07 __P((l2_softc_t *)); -static void F_AE08 __P((l2_softc_t *)); -static void F_AE09 __P((l2_softc_t *)); -static void F_AE10 __P((l2_softc_t *)); -static void F_AE11 __P((l2_softc_t *)); -static void F_AE12 __P((l2_softc_t *)); - -static void F_AR05 __P((l2_softc_t *)); -static void F_AR06 __P((l2_softc_t *)); -static void F_AR07 __P((l2_softc_t *)); -static void F_AR08 __P((l2_softc_t *)); -static void F_AR09 __P((l2_softc_t *)); -static void F_AR10 __P((l2_softc_t *)); -static void F_AR11 __P((l2_softc_t *)); - -static void F_MF01 __P((l2_softc_t *)); -static void F_MF05 __P((l2_softc_t *)); -static void F_MF06 __P((l2_softc_t *)); -static void F_MF07 __P((l2_softc_t *)); -static void F_MF08 __P((l2_softc_t *)); -static void F_MF09 __P((l2_softc_t *)); -static void F_MF10 __P((l2_softc_t *)); -static void F_MF11 __P((l2_softc_t *)); -static void F_MF12 __P((l2_softc_t *)); -static void F_MF13 __P((l2_softc_t *)); -static void F_MF14 __P((l2_softc_t *)); -static void F_MF15 __P((l2_softc_t *)); -static void F_MF16 __P((l2_softc_t *)); -static void F_MF17 __P((l2_softc_t *)); -static void F_MF18 __P((l2_softc_t *)); -static void F_MF19 __P((l2_softc_t *)); -static void F_MF20 __P((l2_softc_t *)); - -static void F_TR01 __P((l2_softc_t *)); -static void F_TR05 __P((l2_softc_t *)); -static void F_TR06 __P((l2_softc_t *)); -static void F_TR07 __P((l2_softc_t *)); -static void F_TR08 __P((l2_softc_t *)); -static void F_TR09 __P((l2_softc_t *)); -static void F_TR10 __P((l2_softc_t *)); -static void F_TR11 __P((l2_softc_t *)); -static void F_TR12 __P((l2_softc_t *)); -static void F_TR13 __P((l2_softc_t *)); -static void F_TR15 __P((l2_softc_t *)); -static void F_TR16 __P((l2_softc_t *)); -static void F_TR17 __P((l2_softc_t *)); -static void F_TR18 __P((l2_softc_t *)); -static void F_TR19 __P((l2_softc_t *)); -static void F_TR20 __P((l2_softc_t *)); -static void F_ILL __P((l2_softc_t *)); -static void F_NCNA __P((l2_softc_t *)); +static void F_TU01 (l2_softc_t *); +static void F_TU03 (l2_softc_t *); + +static void F_TA03 (l2_softc_t *); +static void F_TA04 (l2_softc_t *); +static void F_TA05 (l2_softc_t *); + +static void F_TE03 (l2_softc_t *); +static void F_TE04 (l2_softc_t *); +static void F_TE05 (l2_softc_t *); + +static void F_T01 (l2_softc_t *); +static void F_T05 (l2_softc_t *); +static void F_T06 (l2_softc_t *); +static void F_T07 (l2_softc_t *); +static void F_T08 (l2_softc_t *); +static void F_T09 (l2_softc_t *); +static void F_T10 (l2_softc_t *); +static void F_T13 (l2_softc_t *); + +static void F_AE01 (l2_softc_t *); +static void F_AE05 (l2_softc_t *); +static void F_AE06 (l2_softc_t *); +static void F_AE07 (l2_softc_t *); +static void F_AE08 (l2_softc_t *); +static void F_AE09 (l2_softc_t *); +static void F_AE10 (l2_softc_t *); +static void F_AE11 (l2_softc_t *); +static void F_AE12 (l2_softc_t *); + +static void F_AR05 (l2_softc_t *); +static void F_AR06 (l2_softc_t *); +static void F_AR07 (l2_softc_t *); +static void F_AR08 (l2_softc_t *); +static void F_AR09 (l2_softc_t *); +static void F_AR10 (l2_softc_t *); +static void F_AR11 (l2_softc_t *); + +static void F_MF01 (l2_softc_t *); +static void F_MF05 (l2_softc_t *); +static void F_MF06 (l2_softc_t *); +static void F_MF07 (l2_softc_t *); +static void F_MF08 (l2_softc_t *); +static void F_MF09 (l2_softc_t *); +static void F_MF10 (l2_softc_t *); +static void F_MF11 (l2_softc_t *); +static void F_MF12 (l2_softc_t *); +static void F_MF13 (l2_softc_t *); +static void F_MF14 (l2_softc_t *); +static void F_MF15 (l2_softc_t *); +static void F_MF16 (l2_softc_t *); +static void F_MF17 (l2_softc_t *); +static void F_MF18 (l2_softc_t *); +static void F_MF19 (l2_softc_t *); +static void F_MF20 (l2_softc_t *); + +static void F_TR01 (l2_softc_t *); +static void F_TR05 (l2_softc_t *); +static void F_TR06 (l2_softc_t *); +static void F_TR07 (l2_softc_t *); +static void F_TR08 (l2_softc_t *); +static void F_TR09 (l2_softc_t *); +static void F_TR10 (l2_softc_t *); +static void F_TR11 (l2_softc_t *); +static void F_TR12 (l2_softc_t *); +static void F_TR13 (l2_softc_t *); +static void F_TR15 (l2_softc_t *); +static void F_TR16 (l2_softc_t *); +static void F_TR17 (l2_softc_t *); +static void F_TR18 (l2_softc_t *); +static void F_TR19 (l2_softc_t *); +static void F_TR20 (l2_softc_t *); +static void F_ILL (l2_softc_t *); +static void F_NCNA (l2_softc_t *); /*---------------------------------------------------------------------------* * FSM illegal state default action @@ -207,7 +207,7 @@ F_NCNA(l2_softc_t *l2sc) * layer 2 state transition table *---------------------------------------------------------------------------*/ struct l2state_tab { - void (*func) __P((l2_softc_t *)); /* function to execute */ + void (*func) (l2_softc_t *); /* function to execute */ int newstate; /* next state */ } l2state_tab[N_EVENTS][N_STATES] = { diff --git a/sys/net/i4b/layer4/i4b_i4bdrv.c b/sys/net/i4b/layer4/i4b_i4bdrv.c index 42a1295d76..a204796a19 100644 --- a/sys/net/i4b/layer4/i4b_i4bdrv.c +++ b/sys/net/i4b/layer4/i4b_i4bdrv.c @@ -28,7 +28,7 @@ * -------------------------------------------- * * $FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.11.2.5 2001/12/16 15:12:59 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.6 2003/08/07 21:17:29 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.7 2003/08/26 20:49:48 rob Exp $ * * last edit-date: [Sat Aug 11 18:08:10 2001] * @@ -132,21 +132,21 @@ static void *devfs_token; #ifndef __FreeBSD__ #define PDEVSTATIC /* - not static - */ -PDEVSTATIC void i4battach __P((void)); -PDEVSTATIC int i4bopen __P((dev_t dev, int flag, int fmt, struct proc *p)); -PDEVSTATIC int i4bclose __P((dev_t dev, int flag, int fmt, struct proc *p)); -PDEVSTATIC int i4bread __P((dev_t dev, struct uio *uio, int ioflag)); +PDEVSTATIC void i4battach (void); +PDEVSTATIC int i4bopen (dev_t dev, int flag, int fmt, struct proc *p); +PDEVSTATIC int i4bclose (dev_t dev, int flag, int fmt, struct proc *p); +PDEVSTATIC int i4bread (dev_t dev, struct uio *uio, int ioflag); #ifdef __bsdi__ -PDEVSTATIC int i4bioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)); +PDEVSTATIC int i4bioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p); #else -PDEVSTATIC int i4bioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); +PDEVSTATIC int i4bioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); #endif #ifdef OS_USES_POLL -PDEVSTATIC int i4bpoll __P((dev_t dev, int events, struct proc *p)); +PDEVSTATIC int i4bpoll (dev_t dev, int events, struct proc *p); #else -PDEVSTATIC int i4bselect __P((dev_t dev, int rw, struct proc *p)); +PDEVSTATIC int i4bselect (dev_t dev, int rw, struct proc *p); #endif #endif /* #ifndef __FreeBSD__ */ diff --git a/sys/net/if.c b/sys/net/if.c index 3c1c082d5c..57a08a7e46 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -32,7 +32,7 @@ * * @(#)if.c 8.3 (Berkeley) 1/4/94 * $FreeBSD: src/sys/net/if.c,v 1.85.2.23 2003/04/15 18:11:19 fjoe Exp $ - * $DragonFly: src/sys/net/if.c,v 1.5 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/if.c,v 1.6 2003/08/26 20:49:47 rob Exp $ */ #include "opt_compat.h" @@ -77,12 +77,12 @@ * System initialization */ -static int ifconf __P((u_long, caddr_t)); -static void ifinit __P((void *)); -static void if_qflush __P((struct ifqueue *)); -static void if_slowtimo __P((void *)); -static void link_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); -static int if_rtdel __P((struct radix_node *, void *)); +static int ifconf (u_long, caddr_t); +static void ifinit (void *); +static void if_qflush (struct ifqueue *); +static void if_slowtimo (void *); +static void link_rtrequest (int, struct rtentry *, struct rt_addrinfo *); +static int if_rtdel (struct radix_node *, void *); SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL) @@ -97,11 +97,11 @@ struct ifnethead ifnet; /* depend on static init XXX */ * XXX: declare here to avoid to include many inet6 related files.. * should be more generalized? */ -extern void nd6_setmtu __P((struct ifnet *)); +extern void nd6_setmtu (struct ifnet *); #endif -struct if_clone *if_clone_lookup __P((const char *, int *)); -int if_clone_list __P((struct if_clonereq *)); +struct if_clone *if_clone_lookup (const char *, int *); +int if_clone_list (struct if_clonereq *); LIST_HEAD(, if_clone) if_cloners = LIST_HEAD_INITIALIZER(if_cloners); int if_cloners_count; diff --git a/sys/net/if.h b/sys/net/if.h index d38bc03a3c..cd4d203156 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -32,7 +32,7 @@ * * @(#)if.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if.h,v 1.58.2.9 2002/08/30 14:23:38 sobomax Exp $ - * $DragonFly: src/sys/net/if.h,v 1.4 2003/07/23 02:30:21 dillon Exp $ + * $DragonFly: src/sys/net/if.h,v 1.5 2003/08/26 20:49:47 rob Exp $ */ #ifndef _NET_IF_H_ @@ -329,16 +329,16 @@ struct if_nameindex { }; __BEGIN_DECLS -u_int if_nametoindex __P((const char *)); -struct if_nameindex *if_nameindex __P((void)); -void if_freenameindex __P((struct if_nameindex *)); +u_int if_nametoindex (const char *); +struct if_nameindex *if_nameindex (void); +void if_freenameindex (struct if_nameindex *); __END_DECLS #endif #ifdef _KERNEL struct thread; -int prison_if __P((struct thread *td, struct sockaddr *sa)); +int prison_if (struct thread *td, struct sockaddr *sa); /* XXX - this should go away soon. */ #include diff --git a/sys/net/if_arc.h b/sys/net/if_arc.h index 0758ea20f0..e62e7d6d30 100644 --- a/sys/net/if_arc.h +++ b/sys/net/if_arc.h @@ -1,6 +1,6 @@ /* $NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp $ */ /* $FreeBSD: src/sys/net/if_arc.h,v 1.2.2.3 2003/01/28 11:19:05 fjoe Exp $ */ -/* $DragonFly: src/sys/net/Attic/if_arc.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ */ +/* $DragonFly: src/sys/net/Attic/if_arc.h,v 1.3 2003/08/26 20:49:47 rob Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -131,17 +131,17 @@ struct arccom { #ifdef _KERNEL extern int arc_ipmtu; /* XXX new ip only, no RFC 1051! */ -void arc_ifattach __P((struct ifnet *, u_int8_t)); -void arc_ifdetach __P((struct ifnet *)); -void arc_storelladdr __P((struct ifnet *, u_int8_t)); -int arc_isphds __P((int)); -void arc_input __P((struct ifnet *, struct mbuf *)); -int arc_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *)); -int arc_ioctl __P((struct ifnet *, int, caddr_t)); - -void arc_frag_init __P((struct ifnet *)); -struct mbuf * arc_frag_next __P((struct ifnet *)); +void arc_ifattach (struct ifnet *, u_int8_t); +void arc_ifdetach (struct ifnet *); +void arc_storelladdr (struct ifnet *, u_int8_t); +int arc_isphds (int); +void arc_input (struct ifnet *, struct mbuf *); +int arc_output (struct ifnet *, struct mbuf *, + struct sockaddr *, struct rtentry *); +int arc_ioctl (struct ifnet *, int, caddr_t); + +void arc_frag_init (struct ifnet *); +struct mbuf * arc_frag_next (struct ifnet *); #endif #endif /* _NET_IF_ARC_H_ */ diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index 0b5ccf9bfc..a4cd238430 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -1,6 +1,6 @@ /* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */ /* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.1.2.5 2003/02/05 18:42:15 fjoe Exp $ */ -/* $DragonFly: src/sys/net/Attic/if_arcsubr.c,v 1.3 2003/08/07 21:54:30 dillon Exp $ */ +/* $DragonFly: src/sys/net/Attic/if_arcsubr.c,v 1.4 2003/08/26 20:49:47 rob Exp $ */ /* * Copyright (c) 1994, 1995 Ignatios Souvatzis @@ -84,9 +84,9 @@ MODULE_VERSION(arcnet, 1); #define ARCNET_ALLOW_BROKEN_ARP -static struct mbuf *arc_defrag __P((struct ifnet *, struct mbuf *)); -static int arc_resolvemulti __P((struct ifnet *, struct sockaddr **, - struct sockaddr *)); +static struct mbuf *arc_defrag (struct ifnet *, struct mbuf *); +static int arc_resolvemulti (struct ifnet *, struct sockaddr **, + struct sockaddr *); #define ARC_LLADDR(ifp) (*(u_int8_t *)IF_LLADDR(ifp)) diff --git a/sys/net/if_atm.h b/sys/net/if_atm.h index 8d2678999b..b2b7ce9be2 100644 --- a/sys/net/if_atm.h +++ b/sys/net/if_atm.h @@ -1,6 +1,6 @@ /* $NetBSD: if_atm.h,v 1.7 1996/11/09 23:02:27 chuck Exp $ */ /* $FreeBSD: src/sys/net/if_atm.h,v 1.4 1999/12/29 04:38:34 peter Exp $ */ -/* $DragonFly: src/sys/net/if_atm.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ */ +/* $DragonFly: src/sys/net/if_atm.h,v 1.3 2003/08/26 20:49:47 rob Exp $ */ /* * @@ -99,10 +99,10 @@ struct atmllc { } #ifdef _KERNEL -void atm_ifattach __P((struct ifnet *)); -void atm_input __P((struct ifnet *, struct atm_pseudohdr *, - struct mbuf *, void *)); -int atm_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); +void atm_ifattach (struct ifnet *); +void atm_input (struct ifnet *, struct atm_pseudohdr *, + struct mbuf *, void *); +int atm_output (struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); #endif diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 7c4a872945..b99d651bda 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -32,7 +32,7 @@ * * @(#)if_dl.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_dl.h,v 1.10 2000/03/01 02:46:25 archie Exp $ - * $DragonFly: src/sys/net/if_dl.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ + * $DragonFly: src/sys/net/if_dl.h,v 1.3 2003/08/26 20:49:47 rob Exp $ */ #ifndef _NET_IF_DL_H_ @@ -80,8 +80,8 @@ struct sockaddr_dl { #include __BEGIN_DECLS -void link_addr __P((const char *, struct sockaddr_dl *)); -char *link_ntoa __P((const struct sockaddr_dl *)); +void link_addr (const char *, struct sockaddr_dl *); +char *link_ntoa (const struct sockaddr_dl *); __END_DECLS #endif /* !_KERNEL */ diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index e8d0a46569..5eac7b10a6 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -34,7 +34,7 @@ * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.41.2.8 2002/02/20 23:34:09 fjoe Exp $ - * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.4 2003/08/07 21:54:30 dillon Exp $ + * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.5 2003/08/26 20:49:47 rob Exp $ */ #include "opt_atalk.h" @@ -95,8 +95,8 @@ extern u_char at_org_code[ 3 ]; extern u_char aarp_org_code[ 3 ]; #endif /* NETATALK */ -static int fddi_resolvemulti __P((struct ifnet *, struct sockaddr **, - struct sockaddr *)); +static int fddi_resolvemulti (struct ifnet *, struct sockaddr **, + struct sockaddr *); #define senderr(e) { error = (e); goto bad;} diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index a89fd186eb..ebfc55c556 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -32,7 +32,7 @@ * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_loop.c,v 1.47.2.8 2003/06/01 01:46:11 silby Exp $ - * $DragonFly: src/sys/net/if_loop.c,v 1.5 2003/08/07 21:54:30 dillon Exp $ + * $DragonFly: src/sys/net/if_loop.c,v 1.6 2003/08/26 20:49:47 rob Exp $ */ /* @@ -87,14 +87,14 @@ #include #endif NETATALK -int loioctl __P((struct ifnet *, u_long, caddr_t)); -static void lortrequest __P((int, struct rtentry *, struct rt_addrinfo *)); +int loioctl (struct ifnet *, u_long, caddr_t); +static void lortrequest (int, struct rtentry *, struct rt_addrinfo *); -static void loopattach __P((void *)); +static void loopattach (void *); PSEUDO_SET(loopattach, if_loop); -int looutput __P((struct ifnet *ifp, - struct mbuf *m, struct sockaddr *dst, struct rtentry *rt)); +int looutput (struct ifnet *ifp, + struct mbuf *m, struct sockaddr *dst, struct rtentry *rt); #ifdef TINY_LOMTU #define LOMTU (1024+512) diff --git a/sys/net/if_media.c b/sys/net/if_media.c index 59d5a5e47b..bd3f1dbd01 100644 --- a/sys/net/if_media.c +++ b/sys/net/if_media.c @@ -1,6 +1,6 @@ /* $NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $ */ /* $FreeBSD: src/sys/net/if_media.c,v 1.9.2.4 2001/07/04 00:12:38 brooks Exp $ */ -/* $DragonFly: src/sys/net/if_media.c,v 1.3 2003/07/26 20:19:33 rob Exp $ */ +/* $DragonFly: src/sys/net/if_media.c,v 1.4 2003/08/26 20:49:47 rob Exp $ */ /* * Copyright (c) 1997 @@ -63,12 +63,12 @@ * Useful for debugging newly-ported drivers. */ -static struct ifmedia_entry *ifmedia_match __P((struct ifmedia *ifm, - int flags, int mask)); +static struct ifmedia_entry *ifmedia_match (struct ifmedia *ifm, + int flags, int mask); #ifdef IFMEDIA_DEBUG int ifmedia_debug = 0; -static void ifmedia_printword __P((int)); +static void ifmedia_printword (int); #endif /* diff --git a/sys/net/intrq.h b/sys/net/intrq.h index ccc31d0492..ba0ab4d581 100644 --- a/sys/net/intrq.h +++ b/sys/net/intrq.h @@ -24,14 +24,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/intrq.h,v 1.2 2000/01/27 23:37:39 brian Exp $ - * $DragonFly: src/sys/net/Attic/intrq.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/Attic/intrq.h,v 1.3 2003/08/26 20:49:47 rob Exp $ */ #ifndef _NET_INTRQ_H_ #define _NET_INTRQ_H_ #ifdef _KERNEL -extern int family_enqueue __P((sa_family_t, struct mbuf *)); +extern int family_enqueue (sa_family_t, struct mbuf *); #endif #endif /* _NET_INTRQ_H_ */ diff --git a/sys/net/ip6fw/ip6_fw.c b/sys/net/ip6fw/ip6_fw.c index 7c25f55358..519a3e246a 100644 --- a/sys/net/ip6fw/ip6_fw.c +++ b/sys/net/ip6fw/ip6_fw.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.2.2.9 2002/04/28 05:40:27 suz Exp $ */ -/* $DragonFly: src/sys/net/ip6fw/ip6_fw.c,v 1.4 2003/08/07 21:17:29 dillon Exp $ */ +/* $DragonFly: src/sys/net/ip6fw/ip6_fw.c,v 1.5 2003/08/26 20:49:48 rob Exp $ */ /* $KAME: ip6_fw.c,v 1.21 2001/01/24 01:25:32 itojun Exp $ */ /* @@ -130,24 +130,24 @@ SYSCTL_INT(_net_inet6_ip6_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, &fw6_verbose_ } while (0) #define SNPARGS(buf, len) buf + len, sizeof(buf) > len ? sizeof(buf) - len : 0 -static int add_entry6 __P((struct ip6_fw_head *chainptr, struct ip6_fw *frwl)); -static int del_entry6 __P((struct ip6_fw_head *chainptr, u_short number)); -static int zero_entry6 __P((struct mbuf *m)); -static struct ip6_fw *check_ip6fw_struct __P((struct ip6_fw *m)); -static struct ip6_fw *check_ip6fw_mbuf __P((struct mbuf *fw)); -static int ip6opts_match __P((struct ip6_hdr **ip6, struct ip6_fw *f, +static int add_entry6 (struct ip6_fw_head *chainptr, struct ip6_fw *frwl); +static int del_entry6 (struct ip6_fw_head *chainptr, u_short number); +static int zero_entry6 (struct mbuf *m); +static struct ip6_fw *check_ip6fw_struct (struct ip6_fw *m); +static struct ip6_fw *check_ip6fw_mbuf (struct mbuf *fw); +static int ip6opts_match (struct ip6_hdr **ip6, struct ip6_fw *f, struct mbuf **m, - int *off, int *nxt, u_short *offset)); -static int port_match6 __P((u_short *portptr, int nports, u_short port, - int range_flag)); -static int tcp6flg_match __P((struct tcphdr *tcp6, struct ip6_fw *f)); -static int icmp6type_match __P((struct icmp6_hdr * icmp, struct ip6_fw * f)); -static void ip6fw_report __P((struct ip6_fw *f, struct ip6_hdr *ip6, - struct ifnet *rif, struct ifnet *oif, int off, int nxt)); - -static int ip6_fw_chk __P((struct ip6_hdr **pip6, - struct ifnet *oif, u_int16_t *cookie, struct mbuf **m)); -static int ip6_fw_ctl __P((int stage, struct mbuf **mm)); + int *off, int *nxt, u_short *offset); +static int port_match6 (u_short *portptr, int nports, u_short port, + int range_flag); +static int tcp6flg_match (struct tcphdr *tcp6, struct ip6_fw *f); +static int icmp6type_match (struct icmp6_hdr * icmp, struct ip6_fw * f); +static void ip6fw_report (struct ip6_fw *f, struct ip6_hdr *ip6, + struct ifnet *rif, struct ifnet *oif, int off, int nxt); + +static int ip6_fw_chk (struct ip6_hdr **pip6, + struct ifnet *oif, u_int16_t *cookie, struct mbuf **m); +static int ip6_fw_ctl (int stage, struct mbuf **mm); static char err_prefix[] = "ip6_fw_ctl:"; diff --git a/sys/net/ip6fw/ip6_fw.h b/sys/net/ip6fw/ip6_fw.h index 08757fbe6f..7bbd166743 100644 --- a/sys/net/ip6fw/ip6_fw.h +++ b/sys/net/ip6fw/ip6_fw.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_fw.h,v 1.3.2.7 2002/04/28 05:40:27 suz Exp $ */ -/* $DragonFly: src/sys/net/ip6fw/ip6_fw.h,v 1.2 2003/06/17 04:28:52 dillon Exp $ */ +/* $DragonFly: src/sys/net/ip6fw/ip6_fw.h,v 1.3 2003/08/26 20:49:48 rob Exp $ */ /* $KAME: ip6_fw.h,v 1.9 2001/08/01 04:29:57 sumikawa Exp $ */ /* @@ -220,9 +220,9 @@ void ip6_fw_init(void); /* Firewall hooks */ struct ip6_hdr; -typedef int ip6_fw_chk_t __P((struct ip6_hdr**, struct ifnet*, - u_short *, struct mbuf**)); -typedef int ip6_fw_ctl_t __P((int, struct mbuf**)); +typedef int ip6_fw_chk_t (struct ip6_hdr**, struct ifnet*, + u_short *, struct mbuf**); +typedef int ip6_fw_ctl_t (int, struct mbuf**); extern ip6_fw_chk_t *ip6_fw_chk_ptr; extern ip6_fw_ctl_t *ip6_fw_ctl_ptr; extern int ip6_fw_enable; diff --git a/sys/net/ipfw/ip_fw.h b/sys/net/ipfw/ip_fw.h index aaf8cf9a15..353141cd84 100644 --- a/sys/net/ipfw/ip_fw.h +++ b/sys/net/ipfw/ip_fw.h @@ -12,7 +12,7 @@ * This software is provided ``AS IS'' without any warranties of any kind. * * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.47.2.11 2002/07/09 09:11:42 luigi Exp $ - * $DragonFly: src/sys/net/ipfw/ip_fw.h,v 1.3 2003/08/07 21:17:29 dillon Exp $ + * $DragonFly: src/sys/net/ipfw/ip_fw.h,v 1.4 2003/08/26 20:49:48 rob Exp $ */ #ifndef _IP_FW_H @@ -355,7 +355,7 @@ struct ip_fw_args { /* * Function definitions. */ -void ip_fw_init __P((void)); +void ip_fw_init (void); /* Firewall hooks */ struct sockopt; diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h index 9bd6eadb8d..94f6726866 100644 --- a/sys/net/iso88025.h +++ b/sys/net/iso88025.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/iso88025.h,v 1.3.2.2 2002/06/18 00:15:31 kbyanc Exp $ - * $DragonFly: src/sys/net/Attic/iso88025.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/Attic/iso88025.h,v 1.3 2003/08/26 20:49:47 rob Exp $ * * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and * the Mach token ring driver. @@ -126,9 +126,9 @@ struct iso88025_addr { #define ISO88025_DEFAULT_MTU 1500 #define senderr(e) { error = (e); goto bad;} -void iso88025_ifattach __P((struct ifnet *)); -int iso88025_ioctl __P((struct ifnet *, int , caddr_t )); -int iso88025_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *)); -void iso88025_input __P((struct ifnet *, struct iso88025_header *, struct mbuf *)); +void iso88025_ifattach (struct ifnet *); +int iso88025_ioctl (struct ifnet *, int , caddr_t ); +int iso88025_output (struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); +void iso88025_input (struct ifnet *, struct iso88025_header *, struct mbuf *); #endif diff --git a/sys/net/net_osdep.h b/sys/net/net_osdep.h index a0a965ef4e..46150b795d 100644 --- a/sys/net/net_osdep.h +++ b/sys/net/net_osdep.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/net_osdep.h,v 1.1.2.3 2002/04/28 05:40:25 suz Exp $ */ -/* $DragonFly: src/sys/net/net_osdep.h,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ +/* $DragonFly: src/sys/net/net_osdep.h,v 1.4 2003/08/26 20:49:47 rob Exp $ */ /* $KAME: net_osdep.h,v 1.68 2001/12/21 08:14:58 itojun Exp $ */ /* @@ -289,7 +289,7 @@ #ifdef _KERNEL struct ifnet; -extern const char *if_name __P((struct ifnet *)); +extern const char *if_name (struct ifnet *); #define HAVE_OLD_BPF diff --git a/sys/net/netisr.h b/sys/net/netisr.h index a6d4caeb40..2e69a7cb8d 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -32,7 +32,7 @@ * * @(#)netisr.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/netisr.h,v 1.21.2.5 2002/02/09 23:02:39 luigi Exp $ - * $DragonFly: src/sys/net/netisr.h,v 1.3 2003/06/29 03:28:45 dillon Exp $ + * $DragonFly: src/sys/net/netisr.h,v 1.4 2003/08/26 20:49:47 rob Exp $ */ #ifndef _NET_NETISR_H_ @@ -72,10 +72,10 @@ #ifndef LOCORE #ifdef _KERNEL -typedef void netisr_t __P((void)); +typedef void netisr_t (void); -int register_netisr __P((int, netisr_t *)); -int unregister_netisr __P((int)); +int register_netisr (int, netisr_t *); +int unregister_netisr (int); void schednetisr(int isrnum); diff --git a/sys/net/ppp/if_ppp.c b/sys/net/ppp/if_ppp.c index cab977c8f5..e0c3061c8a 100644 --- a/sys/net/ppp/if_ppp.c +++ b/sys/net/ppp/if_ppp.c @@ -70,7 +70,7 @@ */ /* $FreeBSD: src/sys/net/if_ppp.c,v 1.67.2.4 2002/04/14 21:41:48 luigi Exp $ */ -/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.7 2003/08/07 21:54:31 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.8 2003/08/26 20:49:48 rob Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -133,19 +133,19 @@ struct ppp_softc ppp_softc[NPPP]; /* XXX layering violation */ -extern void pppasyncattach __P((void *)); +extern void pppasyncattach (void *); -static void pppattach __P((void *)); +static void pppattach (void *); PSEUDO_SET(pppattach, if_ppp); -static int pppsioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data)); -static void pppintr __P((void)); +static int pppsioctl (struct ifnet *ifp, u_long cmd, caddr_t data); +static void pppintr (void); -static void ppp_requeue __P((struct ppp_softc *)); -static void ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd)); -static void ppp_ccp_closed __P((struct ppp_softc *)); -static void ppp_inproc __P((struct ppp_softc *, struct mbuf *)); -static void pppdumpm __P((struct mbuf *m0)); +static void ppp_requeue (struct ppp_softc *); +static void ppp_ccp (struct ppp_softc *, struct mbuf *m, int rcvd); +static void ppp_ccp_closed (struct ppp_softc *); +static void ppp_inproc (struct ppp_softc *, struct mbuf *); +static void pppdumpm (struct mbuf *m0); /* * Some useful mbuf macros not in mbuf.h. diff --git a/sys/net/ppp/if_pppvar.h b/sys/net/ppp/if_pppvar.h index bc0db35358..9d9b4b4f0a 100644 --- a/sys/net/ppp/if_pppvar.h +++ b/sys/net/ppp/if_pppvar.h @@ -40,7 +40,7 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/sys/net/if_pppvar.h,v 1.15 2000/01/29 16:56:23 peter Exp $ - * $DragonFly: src/sys/net/ppp/if_pppvar.h,v 1.3 2003/06/25 03:56:02 dillon Exp $ + * $DragonFly: src/sys/net/ppp/if_pppvar.h,v 1.4 2003/08/26 20:49:48 rob Exp $ */ /* @@ -58,10 +58,10 @@ struct ppp_softc { /*hi*/ u_int sc_flags; /* control/status bits; see if_ppp.h */ struct callout_handle sc_ch; /* Used for scheduling timeouts */ void *sc_devp; /* pointer to device-dep structure */ - void (*sc_start) __P((struct ppp_softc *)); /* start output proc */ - void (*sc_ctlp) __P((struct ppp_softc *)); /* rcvd control pkt */ - void (*sc_relinq) __P((struct ppp_softc *)); /* relinquish ifunit */ - void (*sc_setmtu) __P((struct ppp_softc *)); /* set mtu */ + void (*sc_start) (struct ppp_softc *); /* start output proc */ + void (*sc_ctlp) (struct ppp_softc *); /* rcvd control pkt */ + void (*sc_relinq) (struct ppp_softc *); /* relinquish ifunit */ + void (*sc_setmtu) (struct ppp_softc *); /* set mtu */ short sc_mru; /* max receive unit */ struct thread *sc_xfer; /* used in transferring unit */ /*hi*/ struct ifqueue sc_rawq; /* received packets */ @@ -101,12 +101,12 @@ struct ppp_softc { extern struct ppp_softc ppp_softc[]; -struct ppp_softc *pppalloc __P((struct thread *td)); -void pppdealloc __P((struct ppp_softc *sc)); -int pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data, - int flag, struct thread *td)); -int pppoutput __P((struct ifnet *ifp, struct mbuf *m0, - struct sockaddr *dst, struct rtentry *rtp)); -void ppp_restart __P((struct ppp_softc *sc)); -void ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost)); -struct mbuf *ppp_dequeue __P((struct ppp_softc *sc)); +struct ppp_softc *pppalloc (struct thread *td); +void pppdealloc (struct ppp_softc *sc); +int pppioctl (struct ppp_softc *sc, u_long cmd, caddr_t data, + int flag, struct thread *td); +int pppoutput (struct ifnet *ifp, struct mbuf *m0, + struct sockaddr *dst, struct rtentry *rtp); +void ppp_restart (struct ppp_softc *sc); +void ppppktin (struct ppp_softc *sc, struct mbuf *m, int lost); +struct mbuf *ppp_dequeue (struct ppp_softc *sc); diff --git a/sys/net/ppp_layer/ppp_comp.h b/sys/net/ppp_layer/ppp_comp.h index d73733b511..67803035d0 100644 --- a/sys/net/ppp_layer/ppp_comp.h +++ b/sys/net/ppp_layer/ppp_comp.h @@ -25,7 +25,7 @@ * OR MODIFICATIONS. * * $FreeBSD: src/sys/net/ppp_comp.h,v 1.8 1999/08/28 00:48:25 peter Exp $ - * $DragonFly: src/sys/net/ppp_layer/ppp_comp.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/ppp_layer/ppp_comp.h,v 1.3 2003/08/26 20:49:48 rob Exp $ */ #ifndef _NET_PPP_COMP_H @@ -52,36 +52,36 @@ struct compressor { int compress_proto; /* CCP compression protocol number */ /* Allocate space for a compressor (transmit side) */ - void *(*comp_alloc) __P((u_char *options, int opt_len)); + void *(*comp_alloc) (u_char *options, int opt_len); /* Free space used by a compressor */ - void (*comp_free) __P((void *state)); + void (*comp_free) (void *state); /* Initialize a compressor */ - int (*comp_init) __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); + int (*comp_init) (void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); /* Reset a compressor */ - void (*comp_reset) __P((void *state)); + void (*comp_reset) (void *state); /* Compress a packet */ - int (*compress) __P((void *state, PACKETPTR *mret, - PACKETPTR mp, int orig_len, int max_len)); + int (*compress) (void *state, PACKETPTR *mret, + PACKETPTR mp, int orig_len, int max_len); /* Return compression statistics */ - void (*comp_stat) __P((void *state, struct compstat *stats)); + void (*comp_stat) (void *state, struct compstat *stats); /* Allocate space for a decompressor (receive side) */ - void *(*decomp_alloc) __P((u_char *options, int opt_len)); + void *(*decomp_alloc) (u_char *options, int opt_len); /* Free space used by a decompressor */ - void (*decomp_free) __P((void *state)); + void (*decomp_free) (void *state); /* Initialize a decompressor */ - int (*decomp_init) __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); + int (*decomp_init) (void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); /* Reset a decompressor */ - void (*decomp_reset) __P((void *state)); + void (*decomp_reset) (void *state); /* Decompress a packet. */ - int (*decompress) __P((void *state, PACKETPTR mp, - PACKETPTR *dmpp)); + int (*decompress) (void *state, PACKETPTR mp, + PACKETPTR *dmpp); /* Update state for an incompressible packet received */ - void (*incomp) __P((void *state, PACKETPTR mp)); + void (*incomp) (void *state, PACKETPTR mp); /* Return decompression statistics */ - void (*decomp_stat) __P((void *state, struct compstat *stats)); + void (*decomp_stat) (void *state, struct compstat *stats); }; #endif /* PACKETPTR */ diff --git a/sys/net/ppp_layer/ppp_deflate.c b/sys/net/ppp_layer/ppp_deflate.c index 0ede12b736..788f8cd61f 100644 --- a/sys/net/ppp_layer/ppp_deflate.c +++ b/sys/net/ppp_layer/ppp_deflate.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/ppp_deflate.c,v 1.12.2.1 2002/04/14 21:41:48 luigi Exp $ */ -/* $DragonFly: src/sys/net/ppp_layer/ppp_deflate.c,v 1.3 2003/08/07 21:17:30 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp_layer/ppp_deflate.c,v 1.4 2003/08/26 20:49:48 rob Exp $ */ /* * ppp_deflate.c - interface the zlib procedures for Deflate compression @@ -60,24 +60,24 @@ struct deflate_state { #define DEFLATE_OVHD 2 /* Deflate overhead/packet */ -static void *z_alloc __P((void *, u_int items, u_int size)); -static void z_free __P((void *, void *ptr)); -static void *z_comp_alloc __P((u_char *options, int opt_len)); -static void *z_decomp_alloc __P((u_char *options, int opt_len)); -static void z_comp_free __P((void *state)); -static void z_decomp_free __P((void *state)); -static int z_comp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); -static int z_decomp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); -static int z_compress __P((void *state, struct mbuf **mret, - struct mbuf *mp, int slen, int maxolen)); -static void z_incomp __P((void *state, struct mbuf *dmsg)); -static int z_decompress __P((void *state, struct mbuf *cmp, - struct mbuf **dmpp)); -static void z_comp_reset __P((void *state)); -static void z_decomp_reset __P((void *state)); -static void z_comp_stats __P((void *state, struct compstat *stats)); +static void *z_alloc (void *, u_int items, u_int size); +static void z_free (void *, void *ptr); +static void *z_comp_alloc (u_char *options, int opt_len); +static void *z_decomp_alloc (u_char *options, int opt_len); +static void z_comp_free (void *state); +static void z_decomp_free (void *state); +static int z_comp_init (void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); +static int z_decomp_init (void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); +static int z_compress (void *state, struct mbuf **mret, + struct mbuf *mp, int slen, int maxolen); +static void z_incomp (void *state, struct mbuf *dmsg); +static int z_decompress (void *state, struct mbuf *cmp, + struct mbuf **dmpp); +static void z_comp_reset (void *state); +static void z_decomp_reset (void *state); +static void z_comp_stats (void *state, struct compstat *stats); /* * Procedures exported to if_ppp.c. diff --git a/sys/net/ppp_layer/ppp_defs.h b/sys/net/ppp_layer/ppp_defs.h index 25296af655..9b9bee5dbf 100644 --- a/sys/net/ppp_layer/ppp_defs.h +++ b/sys/net/ppp_layer/ppp_defs.h @@ -25,7 +25,7 @@ * OR MODIFICATIONS. * * $FreeBSD: src/sys/net/ppp_defs.h,v 1.6.2.1 2001/07/03 11:01:41 ume Exp $ - * $DragonFly: src/sys/net/ppp_layer/ppp_defs.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/ppp_layer/ppp_defs.h,v 1.3 2003/08/26 20:49:48 rob Exp $ */ #ifndef _PPP_DEFS_H_ @@ -147,12 +147,5 @@ struct ppp_idle { time_t recv_idle; /* time since last NP packet received */ }; -#ifndef __P -#ifdef __STDC__ -#define __P(x) x -#else -#define __P(x) () -#endif -#endif #endif /* _PPP_DEFS_H_ */ diff --git a/sys/net/ppp_layer/ppp_tty.c b/sys/net/ppp_layer/ppp_tty.c index 3637374465..03ed9817f7 100644 --- a/sys/net/ppp_layer/ppp_tty.c +++ b/sys/net/ppp_layer/ppp_tty.c @@ -71,7 +71,7 @@ */ /* $FreeBSD: src/sys/net/ppp_tty.c,v 1.43.2.1 2002/02/13 00:43:11 dillon Exp $ */ -/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.7 2003/08/07 21:17:30 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.8 2003/08/26 20:49:48 rob Exp $ */ #include "opt_ppp.h" /* XXX for ppp_defs.h */ @@ -99,26 +99,26 @@ #include #include -static int pppopen __P((dev_t dev, struct tty *tp)); -static int pppclose __P((struct tty *tp, int flag)); -static int pppread __P((struct tty *tp, struct uio *uio, int flag)); -static int pppwrite __P((struct tty *tp, struct uio *uio, int flag)); -static int ppptioctl __P((struct tty *tp, u_long cmd, caddr_t data, - int flag, struct thread *)); -static int pppinput __P((int c, struct tty *tp)); -static int pppstart __P((struct tty *tp)); - -static u_short pppfcs __P((u_short fcs, u_char *cp, int len)); -static void pppasyncstart __P((struct ppp_softc *)); -static void pppasyncctlp __P((struct ppp_softc *)); -static void pppasyncrelinq __P((struct ppp_softc *)); -static void pppasyncsetmtu __P((struct ppp_softc *)); -static void ppp_timeout __P((void *)); -static void pppgetm __P((struct ppp_softc *sc)); -static void ppplogchar __P((struct ppp_softc *, int)); +static int pppopen (dev_t dev, struct tty *tp); +static int pppclose (struct tty *tp, int flag); +static int pppread (struct tty *tp, struct uio *uio, int flag); +static int pppwrite (struct tty *tp, struct uio *uio, int flag); +static int ppptioctl (struct tty *tp, u_long cmd, caddr_t data, + int flag, struct thread *); +static int pppinput (int c, struct tty *tp); +static int pppstart (struct tty *tp); + +static u_short pppfcs (u_short fcs, u_char *cp, int len); +static void pppasyncstart (struct ppp_softc *); +static void pppasyncctlp (struct ppp_softc *); +static void pppasyncrelinq (struct ppp_softc *); +static void pppasyncsetmtu (struct ppp_softc *); +static void ppp_timeout (void *); +static void pppgetm (struct ppp_softc *sc); +static void ppplogchar (struct ppp_softc *, int); /* XXX called from if_ppp.c - layering violation */ -void pppasyncattach __P((void *)); +void pppasyncattach (void *); /* * Some useful mbuf macros not in mbuf.h. diff --git a/sys/net/radix.c b/sys/net/radix.c index 9adbca7ebf..10580aad67 100644 --- a/sys/net/radix.c +++ b/sys/net/radix.c @@ -32,7 +32,7 @@ * * @(#)radix.c 8.4 (Berkeley) 11/2/94 * $FreeBSD: src/sys/net/radix.c,v 1.20.2.3 2002/04/28 05:40:25 suz Exp $ - * $DragonFly: src/sys/net/radix.c,v 1.4 2003/07/29 12:51:29 hmp Exp $ + * $DragonFly: src/sys/net/radix.c,v 1.5 2003/08/26 20:49:47 rob Exp $ */ /* @@ -51,15 +51,15 @@ #include #endif -static int rn_walktree_from __P((struct radix_node_head *h, void *a, - void *m, walktree_f_t *f, void *w)); -static int rn_walktree __P((struct radix_node_head *, walktree_f_t *, void *)); +static int rn_walktree_from (struct radix_node_head *h, void *a, + void *m, walktree_f_t *f, void *w); +static int rn_walktree (struct radix_node_head *, walktree_f_t *, void *); static struct radix_node - *rn_insert __P((void *, struct radix_node_head *, int *, - struct radix_node [2])), - *rn_newpair __P((void *, int, struct radix_node[2])), - *rn_search __P((void *, struct radix_node *)), - *rn_search_m __P((void *, struct radix_node *, void *)); + *rn_insert (void *, struct radix_node_head *, int *, + struct radix_node [2]), + *rn_newpair (void *, int, struct radix_node[2]), + *rn_search (void *, struct radix_node *), + *rn_search_m (void *, struct radix_node *, void *); static int max_keylen; static struct radix_mask *rn_mkfreelist; @@ -73,12 +73,12 @@ static char *rn_zeros, *rn_ones; #define Bcmp(a, b, l) \ (l == 0 ? 0 : bcmp((caddr_t)(a), (caddr_t)(b), (u_long)l)) -static int rn_lexobetter __P((void *m_arg, void *n_arg)); +static int rn_lexobetter (void *m_arg, void *n_arg); static struct radix_mask * - rn_new_radix_mask __P((struct radix_node *tt, - struct radix_mask *next)); -static int rn_satsifies_leaf __P((char *trial, struct radix_node *leaf, - int skip)); + rn_new_radix_mask (struct radix_node *tt, + struct radix_mask *next); +static int rn_satsifies_leaf (char *trial, struct radix_node *leaf, + int skip); /* * The data structure for the keys is a radix tree with one way diff --git a/sys/net/radix.h b/sys/net/radix.h index ac9b3cc7ff..069c01484f 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -32,7 +32,7 @@ * * @(#)radix.h 8.2 (Berkeley) 10/31/94 * $FreeBSD: src/sys/net/radix.h,v 1.16.2.1 2000/05/03 19:17:11 wollman Exp $ - * $DragonFly: src/sys/net/radix.h,v 1.3 2003/07/29 12:51:29 hmp Exp $ + * $DragonFly: src/sys/net/radix.h,v 1.4 2003/08/26 20:49:47 rob Exp $ */ #ifndef _RADIX_H_ @@ -109,35 +109,35 @@ struct radix_mask { #define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);} -typedef int walktree_f_t __P((struct radix_node *, void *)); +typedef int walktree_f_t (struct radix_node *, void *); struct radix_node_head { struct radix_node *rnh_treetop; int rnh_addrsize; /* permit, but not require fixed keys */ int rnh_pktsize; /* permit, but not require fixed keys */ struct radix_node *(*rnh_addaddr) /* add based on sockaddr */ - __P((void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[])); + (void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); struct radix_node *(*rnh_addpkt) /* add based on packet hdr */ - __P((void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[])); + (void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_delpkt) /* remove based on packet hdr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchaddr) /* locate based on sockaddr */ - __P((void *v, struct radix_node_head *head)); + (void *v, struct radix_node_head *head); struct radix_node *(*rnh_lookup) /* locate based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */ - __P((void *v, struct radix_node_head *head)); + (void *v, struct radix_node_head *head); int (*rnh_walktree) /* traverse tree */ - __P((struct radix_node_head *head, walktree_f_t *f, void *w)); + (struct radix_node_head *head, walktree_f_t *f, void *w); int (*rnh_walktree_from) /* traverse tree below a */ - __P((struct radix_node_head *head, void *a, void *m, - walktree_f_t *f, void *w)); + (struct radix_node_head *head, void *a, void *m, + walktree_f_t *f, void *w); void (*rnh_close) /* do something when the last ref drops */ - __P((struct radix_node *rn, struct radix_node_head *head)); + (struct radix_node *rn, struct radix_node_head *head); struct radix_node rnh_nodes[3]; /* empty tree for common case */ }; @@ -155,17 +155,17 @@ struct radix_node_head { #define Free(p) free((caddr_t)p, M_RTABLE); #endif /* _KERNEL */ -void rn_init __P((void)); -int rn_inithead __P((void **, int)); -int rn_refines __P((void *, void *)); +void rn_init (void); +int rn_inithead (void **, int); +int rn_refines (void *, void *); struct radix_node - *rn_addmask __P((void *, int, int)), - *rn_addroute __P((void *, void *, struct radix_node_head *, - struct radix_node [2])), - *rn_delete __P((void *, void *, struct radix_node_head *)), - *rn_lookup __P((void *v_arg, void *m_arg, - struct radix_node_head *head)), - *rn_match __P((void *, struct radix_node_head *)); + *rn_addmask (void *, int, int), + *rn_addroute (void *, void *, struct radix_node_head *, + struct radix_node [2]), + *rn_delete (void *, void *, struct radix_node_head *), + *rn_lookup (void *v_arg, void *m_arg, + struct radix_node_head *head), + *rn_match (void *, struct radix_node_head *); #endif /* _RADIX_H_ */ diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h index 945eb7b5c7..97cc0e1601 100644 --- a/sys/net/raw_cb.h +++ b/sys/net/raw_cb.h @@ -32,7 +32,7 @@ * * @(#)raw_cb.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/raw_cb.h,v 1.12 1999/12/29 04:38:37 peter Exp $ - * $DragonFly: src/sys/net/raw_cb.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/raw_cb.h,v 1.3 2003/08/26 20:49:47 rob Exp $ */ #ifndef _NET_RAW_CB_H_ @@ -63,13 +63,13 @@ struct rawcb { #ifdef _KERNEL extern LIST_HEAD(rawcb_list_head, rawcb) rawcb_list; -int raw_attach __P((struct socket *, int)); -void raw_ctlinput __P((int, struct sockaddr *, void *)); -void raw_detach __P((struct rawcb *)); -void raw_disconnect __P((struct rawcb *)); -void raw_init __P((void)); -void raw_input __P((struct mbuf *, - struct sockproto *, struct sockaddr *, struct sockaddr *)); +int raw_attach (struct socket *, int); +void raw_ctlinput (int, struct sockaddr *, void *); +void raw_detach (struct rawcb *); +void raw_disconnect (struct rawcb *); +void raw_init (void); +void raw_input (struct mbuf *, + struct sockproto *, struct sockaddr *, struct sockaddr *); extern struct pr_usrreqs raw_usrreqs; #endif diff --git a/sys/net/route.c b/sys/net/route.c index eed2c5ed48..f708eb66b1 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -32,7 +32,7 @@ * * @(#)route.c 8.3 (Berkeley) 1/9/95 * $FreeBSD: src/sys/net/route.c,v 1.59.2.10 2003/01/17 08:04:00 ru Exp $ - * $DragonFly: src/sys/net/route.c,v 1.5 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/route.c,v 1.6 2003/08/26 20:49:47 rob Exp $ */ #include "opt_inet.h" @@ -59,9 +59,9 @@ struct radix_node_head *rt_tables[AF_MAX+1]; static int rttrash; /* routes not in table but not freed */ -static void rt_maskedcopy __P((struct sockaddr *, - struct sockaddr *, struct sockaddr *)); -static void rtable_init __P((void **)); +static void rt_maskedcopy (struct sockaddr *, + struct sockaddr *, struct sockaddr *); +static void rtable_init (void **); static void rtable_init(table) @@ -454,8 +454,8 @@ ifa_ifwithroute(flags, dst, gateway) return (ifa); } -static int rt_fixdelete __P((struct radix_node *, void *)); -static int rt_fixchange __P((struct radix_node *, void *)); +static int rt_fixdelete (struct radix_node *, void *); +static int rt_fixchange (struct radix_node *, void *); struct rtfc_arg { struct rtentry *rt0; diff --git a/sys/net/route.h b/sys/net/route.h index 80f692b76b..32e1be378c 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -32,7 +32,7 @@ * * @(#)route.h 8.4 (Berkeley) 1/9/95 * $FreeBSD: src/sys/net/route.h,v 1.36.2.5 2002/02/01 11:48:01 ru Exp $ - * $DragonFly: src/sys/net/route.h,v 1.3 2003/06/25 03:56:02 dillon Exp $ + * $DragonFly: src/sys/net/route.h,v 1.4 2003/08/26 20:49:47 rob Exp $ */ #ifndef _NET_ROUTE_H_ @@ -110,8 +110,8 @@ struct rtentry { caddr_t rt_llinfo; /* pointer to link level info cache */ struct rt_metrics rt_rmx; /* metrics used by rx'ing protocols */ struct rtentry *rt_gwroute; /* implied entry for gatewayed routes */ - int (*rt_output) __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *)); + int (*rt_output) (struct ifnet *, struct mbuf *, + struct sockaddr *, struct rtentry *); /* output routine for this (rt,if) */ struct rtentry *rt_parent; /* cloning parent of this route */ void *rt_filler2; /* more filler */ @@ -278,27 +278,27 @@ extern struct radix_node_head *rt_tables[AF_MAX+1]; struct ifmultiaddr; struct proc; -void route_init __P((void)); -int rt_getifa __P((struct rt_addrinfo *)); -void rt_ifannouncemsg __P((struct ifnet *, int)); -void rt_ifmsg __P((struct ifnet *)); -void rt_missmsg __P((int, struct rt_addrinfo *, int, int)); -void rt_newaddrmsg __P((int, struct ifaddr *, int, struct rtentry *)); -void rt_newmaddrmsg __P((int, struct ifmultiaddr *)); -int rt_setgate __P((struct rtentry *, - struct sockaddr *, struct sockaddr *)); -void rtalloc __P((struct route *)); -void rtalloc_ign __P((struct route *, u_long)); +void route_init (void); +int rt_getifa (struct rt_addrinfo *); +void rt_ifannouncemsg (struct ifnet *, int); +void rt_ifmsg (struct ifnet *); +void rt_missmsg (int, struct rt_addrinfo *, int, int); +void rt_newaddrmsg (int, struct ifaddr *, int, struct rtentry *); +void rt_newmaddrmsg (int, struct ifmultiaddr *); +int rt_setgate (struct rtentry *, + struct sockaddr *, struct sockaddr *); +void rtalloc (struct route *); +void rtalloc_ign (struct route *, u_long); struct rtentry * - rtalloc1 __P((struct sockaddr *, int, u_long)); -void rtfree __P((struct rtentry *)); -int rtinit __P((struct ifaddr *, int, int)); -int rtioctl __P((u_long, caddr_t, struct thread *)); -void rtredirect __P((struct sockaddr *, struct sockaddr *, - struct sockaddr *, int, struct sockaddr *, struct rtentry **)); -int rtrequest __P((int, struct sockaddr *, - struct sockaddr *, struct sockaddr *, int, struct rtentry **)); -int rtrequest1 __P((int, struct rt_addrinfo *, struct rtentry **)); + rtalloc1 (struct sockaddr *, int, u_long); +void rtfree (struct rtentry *); +int rtinit (struct ifaddr *, int, int); +int rtioctl (u_long, caddr_t, struct thread *); +void rtredirect (struct sockaddr *, struct sockaddr *, + struct sockaddr *, int, struct sockaddr *, struct rtentry **); +int rtrequest (int, struct sockaddr *, + struct sockaddr *, struct sockaddr *, int, struct rtentry **); +int rtrequest1 (int, struct rt_addrinfo *, struct rtentry **); #endif #endif diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 759c529c8b..33acd61a1d 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -32,7 +32,7 @@ * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.44.2.11 2002/12/04 14:05:41 ru Exp $ - * $DragonFly: src/sys/net/rtsock.c,v 1.5 2003/07/26 20:19:34 rob Exp $ + * $DragonFly: src/sys/net/rtsock.c,v 1.6 2003/08/26 20:49:47 rob Exp $ */ @@ -67,14 +67,14 @@ struct walkarg { }; static struct mbuf * - rt_msg1 __P((int, struct rt_addrinfo *)); -static int rt_msg2 __P((int, - struct rt_addrinfo *, caddr_t, struct walkarg *)); -static int rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); -static int sysctl_dumpentry __P((struct radix_node *rn, void *vw)); -static int sysctl_iflist __P((int af, struct walkarg *w)); -static int route_output __P((struct mbuf *, struct socket *)); -static void rt_setmetrics __P((u_long, struct rt_metrics *, struct rt_metrics *)); + rt_msg1 (int, struct rt_addrinfo *); +static int rt_msg2 (int, + struct rt_addrinfo *, caddr_t, struct walkarg *); +static int rt_xaddrs (caddr_t, caddr_t, struct rt_addrinfo *); +static int sysctl_dumpentry (struct radix_node *rn, void *vw); +static int sysctl_iflist (int af, struct walkarg *w); +static int route_output (struct mbuf *, struct socket *); +static void rt_setmetrics (u_long, struct rt_metrics *, struct rt_metrics *); /* Sleazy use of local variables throughout file, warning!!!! */ #define dst info.rti_info[RTAX_DST] diff --git a/sys/net/sl/if_sl.c b/sys/net/sl/if_sl.c index 8b7a8d0e85..c9f570591e 100644 --- a/sys/net/sl/if_sl.c +++ b/sys/net/sl/if_sl.c @@ -32,7 +32,7 @@ * * @(#)if_sl.c 8.6 (Berkeley) 2/1/94 * $FreeBSD: src/sys/net/if_sl.c,v 1.84.2.2 2002/02/13 00:43:10 dillon Exp $ - * $DragonFly: src/sys/net/sl/if_sl.c,v 1.7 2003/08/07 21:17:30 dillon Exp $ + * $DragonFly: src/sys/net/sl/if_sl.c,v 1.8 2003/08/26 20:49:49 rob Exp $ */ /* @@ -110,7 +110,7 @@ #include #endif -static void slattach __P((void *)); +static void slattach (void *); PSEUDO_SET(slattach, if_sl); /* @@ -180,18 +180,18 @@ static struct sl_softc sl_softc[NSL]; #define TRANS_FRAME_END 0xdc /* transposed frame end */ #define TRANS_FRAME_ESCAPE 0xdd /* transposed frame esc */ -static int slinit __P((struct sl_softc *)); -static struct mbuf *sl_btom __P((struct sl_softc *, int)); +static int slinit (struct sl_softc *); +static struct mbuf *sl_btom (struct sl_softc *, int); static timeout_t sl_keepalive; static timeout_t sl_outfill; -static int slclose __P((struct tty *,int)); -static int slinput __P((int, struct tty *)); -static int slioctl __P((struct ifnet *, u_long, caddr_t)); -static int sltioctl __P((struct tty *, u_long, caddr_t, int, struct thread *)); -static int slopen __P((dev_t, struct tty *)); -static int sloutput __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); -static int slstart __P((struct tty *)); +static int slclose (struct tty *,int); +static int slinput (int, struct tty *); +static int slioctl (struct ifnet *, u_long, caddr_t); +static int sltioctl (struct tty *, u_long, caddr_t, int, struct thread *); +static int slopen (dev_t, struct tty *); +static int sloutput (struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); +static int slstart (struct tty *); static struct linesw slipdisc = { slopen, slclose, l_noread, l_nowrite, diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h index bc8f5c21c9..869797d3ef 100644 --- a/sys/net/slcompress.h +++ b/sys/net/slcompress.h @@ -35,7 +35,7 @@ * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989: * - Initial distribution. * $FreeBSD: src/sys/net/slcompress.h,v 1.14.2.1 2000/05/05 13:37:06 jlemon Exp $ - * $DragonFly: src/sys/net/slcompress.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/slcompress.h,v 1.3 2003/08/26 20:49:47 rob Exp $ */ #ifndef _NET_SLCOMPRESS_H_ @@ -153,11 +153,11 @@ struct slcompress { /* flag values */ #define SLF_TOSS 1 /* tossing rcvd frames because of input err */ -void sl_compress_init __P((struct slcompress *, int)); -u_int sl_compress_tcp __P((struct mbuf *, - struct ip *, struct slcompress *, int)); -int sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *)); -int sl_uncompress_tcp_core __P((u_char *, int, int, u_int, - struct slcompress *, u_char **, u_int *)); +void sl_compress_init (struct slcompress *, int); +u_int sl_compress_tcp (struct mbuf *, + struct ip *, struct slcompress *, int); +int sl_uncompress_tcp (u_char **, int, u_int, struct slcompress *); +int sl_uncompress_tcp_core (u_char *, int, int, u_int, + struct slcompress *, u_char **, u_int *); #endif /* !_NET_SLCOMPRESS_H_ */ diff --git a/sys/net/stf/if_stf.c b/sys/net/stf/if_stf.c index 490ceb57ed..bceab25e55 100644 --- a/sys/net/stf/if_stf.c +++ b/sys/net/stf/if_stf.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_stf.c,v 1.1.2.11 2003/01/23 21:06:44 sam Exp $ */ -/* $DragonFly: src/sys/net/stf/if_stf.c,v 1.4 2003/08/07 21:17:30 dillon Exp $ */ +/* $DragonFly: src/sys/net/stf/if_stf.c,v 1.5 2003/08/26 20:49:49 rob Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /* @@ -143,17 +143,17 @@ struct ipprotosw in_stf_protosw = &rip_usrreqs }; -static int stfmodevent __P((module_t, int, void *)); -static int stf_encapcheck __P((const struct mbuf *, int, int, void *)); -static struct in6_ifaddr *stf_getsrcifa6 __P((struct ifnet *)); -static int stf_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); -static int stf_checkaddr4 __P((struct stf_softc *, struct in_addr *, - struct ifnet *)); -static int stf_checkaddr6 __P((struct stf_softc *, struct in6_addr *, - struct ifnet *)); -static void stf_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); -static int stf_ioctl __P((struct ifnet *, u_long, caddr_t)); +static int stfmodevent (module_t, int, void *); +static int stf_encapcheck (const struct mbuf *, int, int, void *); +static struct in6_ifaddr *stf_getsrcifa6 (struct ifnet *); +static int stf_output (struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); +static int stf_checkaddr4 (struct stf_softc *, struct in_addr *, + struct ifnet *); +static int stf_checkaddr6 (struct stf_softc *, struct in6_addr *, + struct ifnet *); +static void stf_rtrequest (int, struct rtentry *, struct rt_addrinfo *); +static int stf_ioctl (struct ifnet *, u_long, caddr_t); static int stfmodevent(mod, type, data) diff --git a/sys/net/stf/if_stf.h b/sys/net/stf/if_stf.h index 7456df4586..3e4f5b67ef 100644 --- a/sys/net/stf/if_stf.h +++ b/sys/net/stf/if_stf.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_stf.h,v 1.1.2.2 2002/04/28 05:40:25 suz Exp $ */ -/* $DragonFly: src/sys/net/stf/if_stf.h,v 1.3 2003/07/23 02:30:21 dillon Exp $ */ +/* $DragonFly: src/sys/net/stf/if_stf.h,v 1.4 2003/08/26 20:49:49 rob Exp $ */ /* $KAME: if_stf.h,v 1.5 2001/10/12 10:09:17 keiichi Exp $ */ /* @@ -34,6 +34,6 @@ #ifndef _NET_IF_STF_H_ #define _NET_IF_STF_H_ -void in_stf_input __P((struct mbuf *, int off, int proto)); +void in_stf_input (struct mbuf *, int off, int proto); #endif /* _NET_IF_STF_H_ */ diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c index b4e02ba77e..2149bbe63e 100644 --- a/sys/net/tap/if_tap.c +++ b/sys/net/tap/if_tap.c @@ -32,7 +32,7 @@ /* * $FreeBSD: src/sys/net/if_tap.c,v 1.3.2.3 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/tap/if_tap.c,v 1.7 2003/08/07 21:17:30 dillon Exp $ + * $DragonFly: src/sys/net/tap/if_tap.c,v 1.8 2003/08/26 20:49:49 rob Exp $ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $ */ @@ -77,15 +77,15 @@ #define VMNET_DEV_MASK 0x00010000 /* module */ -static int tapmodevent __P((module_t, int, void *)); +static int tapmodevent (module_t, int, void *); /* device */ -static void tapcreate __P((dev_t)); +static void tapcreate (dev_t); /* network interface */ -static void tapifstart __P((struct ifnet *)); -static int tapifioctl __P((struct ifnet *, u_long, caddr_t)); -static void tapifinit __P((void *)); +static void tapifstart (struct ifnet *); +static int tapifioctl (struct ifnet *, u_long, caddr_t); +static void tapifinit (void *); /* character device */ static d_open_t tapopen; diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c index e97666298f..338bcde3ed 100644 --- a/sys/net/tun/if_tun.c +++ b/sys/net/tun/if_tun.c @@ -14,7 +14,7 @@ * operation though. * * $FreeBSD: src/sys/net/if_tun.c,v 1.74.2.8 2002/02/13 00:43:11 dillon Exp $ - * $DragonFly: src/sys/net/tun/if_tun.c,v 1.8 2003/08/07 21:17:30 dillon Exp $ + * $DragonFly: src/sys/net/tun/if_tun.c,v 1.9 2003/08/26 20:49:49 rob Exp $ */ #include "opt_inet.h" @@ -53,19 +53,19 @@ static MALLOC_DEFINE(M_TUN, "tun", "Tunnel Interface"); -static void tunattach __P((void *)); +static void tunattach (void *); PSEUDO_SET(tunattach, if_tun); -static void tuncreate __P((dev_t dev)); +static void tuncreate (dev_t dev); #define TUNDEBUG if (tundebug) printf static int tundebug = 0; SYSCTL_INT(_debug, OID_AUTO, if_tun_debug, CTLFLAG_RW, &tundebug, 0, ""); -static int tunoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *rt)); -static int tunifioctl __P((struct ifnet *, u_long, caddr_t)); -static int tuninit __P((struct ifnet *)); +static int tunoutput (struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *rt); +static int tunifioctl (struct ifnet *, u_long, caddr_t); +static int tuninit (struct ifnet *); static d_open_t tunopen; static d_close_t tunclose; -- 2.41.0