First round of __P removal in sys

21 files changed, 352 insertions, 352 deletions

diff --git a/sys/altq/altq_afmap.c b/sys/altq/altq_afmap.c
index 02f266f2b44..61354151781 100644
--- a/sys/altq/altq_afmap.c
+++ b/sys/altq/altq_afmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_afmap.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_afmap.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_afmap.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -57,9 +57,9 @@
 
 LIST_HEAD(, afm_head) afhead_chain;
 
-static struct afm *afm_match4 __P((struct afm_head *, struct flowinfo_in *));
+static struct afm *afm_match4(struct afm_head *, struct flowinfo_in *);
 #ifdef INET6
-static struct afm *afm_match6 __P((struct afm_head *, struct flowinfo_in6 *));
+static struct afm *afm_match6(struct afm_head *, struct flowinfo_in6 *);
 #endif
 
 /*
diff --git a/sys/altq/altq_afmap.h b/sys/altq/altq_afmap.h
index dd48bed2bb2..5bf014b25d9 100644
--- a/sys/altq/altq_afmap.h
+++ b/sys/altq/altq_afmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_afmap.h,v 1.1 2001/06/27 05:28:34 kjc Exp $	*/
+/*	$OpenBSD: altq_afmap.h,v 1.2 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_afmap.h,v 1.5 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -90,14 +90,14 @@ struct afm_head {
 	struct ifnet		*afh_ifp;
 };
 
-struct afm	*afm_top __P((struct ifnet *));
-int		afm_alloc __P((struct ifnet *));
-int		afm_dealloc __P((struct ifnet *));
-int		afm_add __P((struct ifnet *, struct atm_flowmap *));
-int		afm_remove __P((struct afm *));
-int		afm_removeall __P((struct ifnet *));
-struct		afm *afm_lookup __P((struct ifnet *, int, int));
-struct afm 	*afm_match __P((struct ifnet *, struct flowinfo *));
+struct afm	*afm_top(struct ifnet *);
+int		afm_alloc(struct ifnet *);
+int		afm_dealloc(struct ifnet *);
+int		afm_add(struct ifnet *, struct atm_flowmap *);
+int		afm_remove(struct afm *);
+int		afm_removeall(struct ifnet *);
+struct		afm *afm_lookup(struct ifnet *, int, int);
+struct afm 	*afm_match(struct ifnet *, struct flowinfo *);
 
 #endif /* _KERNEL */
 
diff --git a/sys/altq/altq_blue.c b/sys/altq/altq_blue.c
index 0edb34c5baf..ef490d1b314 100644
--- a/sys/altq/altq_blue.c
+++ b/sys/altq/altq_blue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_blue.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_blue.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_blue.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -99,13 +99,13 @@
 static blue_queue_t *blue_list = NULL;
 
 /* internal function prototypes */
-static int blue_enqueue __P((struct ifaltq *, struct mbuf *,
-			     struct altq_pktattr *));
-static struct mbuf *blue_dequeue __P((struct ifaltq *, int));
-static int drop_early __P((blue_t *));
-static int mark_ecn __P((struct mbuf *, struct altq_pktattr *, int));
-static int blue_detach __P((blue_queue_t *));
-static int blue_request __P((struct ifaltq *, int, void *));
+static int blue_enqueue(struct ifaltq *, struct mbuf *,
+			     struct altq_pktattr *);
+static struct mbuf *blue_dequeue(struct ifaltq *, int);
+static int drop_early(blue_t *);
+static int mark_ecn(struct mbuf *, struct altq_pktattr *, int);
+static int blue_detach(blue_queue_t *);
+static int blue_request(struct ifaltq *, int, void *);
 
 /*
  * blue device interface
diff --git a/sys/altq/altq_blue.h b/sys/altq/altq_blue.h
index 1a6ebeb4c82..134fe07c916 100644
--- a/sys/altq/altq_blue.h
+++ b/sys/altq/altq_blue.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_blue.h,v 1.1 2001/06/27 05:28:34 kjc Exp $	*/
+/*	$OpenBSD: altq_blue.h,v 1.2 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_blue.h,v 1.5 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -109,10 +109,10 @@ typedef struct blue_queue {
 	blue_t *rq_blue;
 } blue_queue_t;
 
-extern int blue_init __P((blue_t *, int, int, int, int));
-extern int blue_addq __P((blue_t *, class_queue_t *, struct mbuf *,
-			 struct altq_pktattr *));
-extern struct mbuf *blue_getq __P((blue_t *, class_queue_t *));
+extern int blue_init(blue_t *, int, int, int, int);
+extern int blue_addq(blue_t *, class_queue_t *, struct mbuf *,
+			 struct altq_pktattr *);
+extern struct mbuf *blue_getq(blue_t *, class_queue_t *);
 
 #endif /* _KERNEL */
 
diff --git a/sys/altq/altq_cbq.c b/sys/altq/altq_cbq.c
index 180c47e615c..a3a07578521 100644
--- a/sys/altq/altq_cbq.c
+++ b/sys/altq/altq_cbq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_cbq.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_cbq.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_cbq.c,v 1.9 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -59,28 +59,28 @@ static cbq_state_t *cbq_list = NULL;
  * Forward Declarations.
  */
 
-static int	cbq_add_class __P((struct cbq_add_class *));
-static int	cbq_delete_class __P((struct cbq_delete_class *));
-static int	cbq_modify_class __P((struct cbq_modify_class *));
-static int 	cbq_class_create __P((cbq_state_t *, struct cbq_add_class *,
-				      struct rm_class *, struct rm_class *));
-static int	cbq_class_destroy __P((cbq_state_t *, struct rm_class *));
-static struct rm_class  *clh_to_clp __P((cbq_state_t *, u_long));
-static int	cbq_add_filter __P((struct cbq_add_filter *));
-static int	cbq_delete_filter __P((struct cbq_delete_filter *));
-
-static int	cbq_clear_hierarchy __P((struct cbq_interface *));
-static int	cbq_clear_interface __P((cbq_state_t *));
-static int	cbq_request __P((struct ifaltq *, int, void *));
-static int	cbq_set_enable __P((struct cbq_interface *, int));
-static int	cbq_ifattach __P((struct cbq_interface *));
-static int	cbq_ifdetach __P((struct cbq_interface *));
-static int	cbq_enqueue __P((struct ifaltq *, struct mbuf *,
-				 struct altq_pktattr *));
-static struct mbuf 	*cbq_dequeue __P((struct ifaltq *, int));
-static void	cbqrestart __P((struct ifaltq *));
-static void 	get_class_stats __P((class_stats_t *, struct rm_class *));
-static int 	cbq_getstats __P((struct cbq_getstats *));
+static int	cbq_add_class(struct cbq_add_class *);
+static int	cbq_delete_class(struct cbq_delete_class *);
+static int	cbq_modify_class(struct cbq_modify_class *);
+static int 	cbq_class_create(cbq_state_t *, struct cbq_add_class *,
+				      struct rm_class *, struct rm_class *);
+static int	cbq_class_destroy(cbq_state_t *, struct rm_class *);
+static struct rm_class  *clh_to_clp(cbq_state_t *, u_long);
+static int	cbq_add_filter(struct cbq_add_filter *);
+static int	cbq_delete_filter(struct cbq_delete_filter *);
+
+static int	cbq_clear_hierarchy(struct cbq_interface *);
+static int	cbq_clear_interface(cbq_state_t *);
+static int	cbq_request(struct ifaltq *, int, void *);
+static int	cbq_set_enable(struct cbq_interface *, int);
+static int	cbq_ifattach(struct cbq_interface *);
+static int	cbq_ifdetach(struct cbq_interface *);
+static int	cbq_enqueue(struct ifaltq *, struct mbuf *,
+				 struct altq_pktattr *);
+static struct mbuf 	*cbq_dequeue(struct ifaltq *, int);
+static void	cbqrestart(struct ifaltq *);
+static void 	get_class_stats(class_stats_t *, struct rm_class *);
+static int 	cbq_getstats(struct cbq_getstats *);
 static void	cbq_purge(cbq_state_t *);
 
 static int
diff --git a/sys/altq/altq_cdnr.c b/sys/altq/altq_cdnr.c
index 8c1cb317b42..3b96ded5fd3 100644
--- a/sys/altq/altq_cdnr.c
+++ b/sys/altq/altq_cdnr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_cdnr.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_cdnr.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_cdnr.c,v 1.8 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -60,62 +60,62 @@ int altq_cdnr_enabled = 0;
 /* cdnr_list keeps all cdnr's allocated. */
 static LIST_HEAD(, top_cdnr) tcb_list;
 
-int cdnropen __P((dev_t, int, int, struct proc *));
-int cdnrclose __P((dev_t, int, int, struct proc *));
-int cdnrioctl __P((dev_t, ioctlcmd_t, caddr_t, int, struct proc *));
+int cdnropen(dev_t, int, int, struct proc *);
+int cdnrclose(dev_t, int, int, struct proc *);
+int cdnrioctl(dev_t, ioctlcmd_t, caddr_t, int, struct proc *);
 
-static int altq_cdnr_input __P((struct mbuf *, int));
-static struct top_cdnr *tcb_lookup __P((char *ifname));
-static struct cdnr_block *cdnr_handle2cb __P((u_long));
-static u_long cdnr_cb2handle __P((struct cdnr_block *));
+static int altq_cdnr_input(struct mbuf *, int);
+static struct top_cdnr *tcb_lookup(char *ifname);
+static struct cdnr_block *cdnr_handle2cb(u_long);
+static u_long cdnr_cb2handle(struct cdnr_block *);
 static void *cdnr_cballoc __P((struct top_cdnr *, int,
        struct tc_action *(*)(struct cdnr_block *, struct cdnr_pktinfo *)));
-static void cdnr_cbdestroy __P((void *));
-static int tca_verify_action __P((struct tc_action *));
-static void tca_import_action __P((struct tc_action *, struct tc_action *));
-static void tca_invalidate_action __P((struct tc_action *));
-
-static int generic_element_destroy __P((struct cdnr_block *));
-static struct top_cdnr *top_create __P((struct ifaltq *));
-static int top_destroy __P((struct top_cdnr *));
-static struct cdnr_block *element_create __P((struct top_cdnr *,
-					      struct tc_action *));
-static int element_destroy __P((struct cdnr_block *));
-static void tb_import_profile __P((struct tbe *, struct tb_profile *));
-static struct tbmeter *tbm_create __P((struct top_cdnr *, struct tb_profile *,
-			   struct tc_action *, struct tc_action *));
-static int tbm_destroy __P((struct tbmeter *));
-static struct tc_action *tbm_input __P((struct cdnr_block *,
-					struct cdnr_pktinfo *));
-static struct trtcm *trtcm_create __P((struct top_cdnr *,
+static void cdnr_cbdestroy(void *);
+static int tca_verify_action(struct tc_action *);
+static void tca_import_action(struct tc_action *, struct tc_action *);
+static void tca_invalidate_action(struct tc_action *);
+
+static int generic_element_destroy(struct cdnr_block *);
+static struct top_cdnr *top_create(struct ifaltq *);
+static int top_destroy(struct top_cdnr *);
+static struct cdnr_block *element_create(struct top_cdnr *,
+					      struct tc_action *);
+static int element_destroy(struct cdnr_block *);
+static void tb_import_profile(struct tbe *, struct tb_profile *);
+static struct tbmeter *tbm_create(struct top_cdnr *, struct tb_profile *,
+			   struct tc_action *, struct tc_action *);
+static int tbm_destroy(struct tbmeter *);
+static struct tc_action *tbm_input(struct cdnr_block *,
+					struct cdnr_pktinfo *);
+static struct trtcm *trtcm_create(struct top_cdnr *,
 		  struct tb_profile *, struct tb_profile *,
 		  struct tc_action *, struct tc_action *, struct tc_action *,
-		  int));
-static int trtcm_destroy __P((struct trtcm *));
-static struct tc_action *trtcm_input __P((struct cdnr_block *,
-					  struct cdnr_pktinfo *));
-static struct tswtcm *tswtcm_create __P((struct top_cdnr *,
+		  int);
+static int trtcm_destroy(struct trtcm *);
+static struct tc_action *trtcm_input(struct cdnr_block *,
+					  struct cdnr_pktinfo *);
+static struct tswtcm *tswtcm_create(struct top_cdnr *,
 		  u_int32_t, u_int32_t, u_int32_t,
-		  struct tc_action *, struct tc_action *, struct tc_action *));
-static int tswtcm_destroy __P((struct tswtcm *));
-static struct tc_action *tswtcm_input __P((struct cdnr_block *,
-					   struct cdnr_pktinfo *));
-
-static int cdnrcmd_if_attach __P((char *));
-static int cdnrcmd_if_detach __P((char *));
-static int cdnrcmd_add_element __P((struct cdnr_add_element *));
-static int cdnrcmd_delete_element __P((struct cdnr_delete_element *));
-static int cdnrcmd_add_filter __P((struct cdnr_add_filter *));
-static int cdnrcmd_delete_filter __P((struct cdnr_delete_filter *));
-static int cdnrcmd_add_tbm __P((struct cdnr_add_tbmeter *));
-static int cdnrcmd_modify_tbm __P((struct cdnr_modify_tbmeter *));
-static int cdnrcmd_tbm_stats __P((struct cdnr_tbmeter_stats *));
-static int cdnrcmd_add_trtcm __P((struct cdnr_add_trtcm *));
-static int cdnrcmd_modify_trtcm __P((struct cdnr_modify_trtcm *));
-static int cdnrcmd_tcm_stats __P((struct cdnr_tcm_stats *));
-static int cdnrcmd_add_tswtcm __P((struct cdnr_add_tswtcm *));
-static int cdnrcmd_modify_tswtcm __P((struct cdnr_modify_tswtcm *));
-static int cdnrcmd_get_stats __P((struct cdnr_get_stats *));
+		  struct tc_action *, struct tc_action *, struct tc_action *);
+static int tswtcm_destroy(struct tswtcm *);
+static struct tc_action *tswtcm_input(struct cdnr_block *,
+					   struct cdnr_pktinfo *);
+
+static int cdnrcmd_if_attach(char *);
+static int cdnrcmd_if_detach(char *);
+static int cdnrcmd_add_element(struct cdnr_add_element *);
+static int cdnrcmd_delete_element(struct cdnr_delete_element *);
+static int cdnrcmd_add_filter(struct cdnr_add_filter *);
+static int cdnrcmd_delete_filter(struct cdnr_delete_filter *);
+static int cdnrcmd_add_tbm(struct cdnr_add_tbmeter *);
+static int cdnrcmd_modify_tbm(struct cdnr_modify_tbmeter *);
+static int cdnrcmd_tbm_stats(struct cdnr_tbmeter_stats *);
+static int cdnrcmd_add_trtcm(struct cdnr_add_trtcm *);
+static int cdnrcmd_modify_trtcm(struct cdnr_modify_trtcm *);
+static int cdnrcmd_tcm_stats(struct cdnr_tcm_stats *);
+static int cdnrcmd_add_tswtcm(struct cdnr_add_tswtcm *);
+static int cdnrcmd_modify_tswtcm(struct cdnr_modify_tswtcm *);
+static int cdnrcmd_get_stats(struct cdnr_get_stats *);
 
 /*
  * top level input function called from ip_input.
diff --git a/sys/altq/altq_conf.c b/sys/altq/altq_conf.c
index 9ff133e715b..de8c057cce5 100644
--- a/sys/altq/altq_conf.c
+++ b/sys/altq/altq_conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_conf.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_conf.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_conf.c,v 1.11 2001/06/21 11:00:36 kjc Exp $	*/
 
 /*
@@ -149,9 +149,9 @@ int	naltqsw = sizeof (altqsw) / sizeof (altqsw[0]);
 static	d_open_t	altqopen;
 static	d_close_t	altqclose;
 static	d_ioctl_t	altqioctl;
-static void altq_drvinit __P((void *));
+static void altq_drvinit(void *);
 #else
-void	altqattach __P((int));
+void	altqattach(int);
 #endif
 
 #if defined(__FreeBSD__)
@@ -329,8 +329,8 @@ SYSINIT(altqdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,altq_drvinit,NULL)
 /*
  * KLD support
  */
-static int altq_module_register __P((struct altq_module_data *));
-static int altq_module_deregister __P((struct altq_module_data *));
+static int altq_module_register(struct altq_module_data *);
+static int altq_module_deregister(struct altq_module_data *);
 
 static struct altq_module_data *altq_modules[ALTQT_MAX];
 static struct altqsw noqdisc = {"noq", noopen, noclose, noioctl};
diff --git a/sys/altq/altq_conf.h b/sys/altq/altq_conf.h
index de935e58daa..601901d6eca 100644
--- a/sys/altq/altq_conf.h
+++ b/sys/altq/altq_conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_conf.h,v 1.1 2001/06/27 05:28:35 kjc Exp $	*/
+/*	$OpenBSD: altq_conf.h,v 1.2 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_conf.h,v 1.6 2001/01/29 19:59:09 itojun Exp $	*/
 
 /*
@@ -52,9 +52,9 @@
 #endif
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-typedef int d_open_t __P((dev_t, int, int, struct proc *));
-typedef int d_close_t __P((dev_t, int, int, struct proc *));
-typedef int d_ioctl_t __P((dev_t, u_long, caddr_t, int, struct proc *));
+typedef int d_open_t(dev_t, int, int, struct proc *);
+typedef int d_close_t(dev_t, int, int, struct proc *);
+typedef int d_ioctl_t(dev_t, u_long, caddr_t, int, struct proc *);
 
 #define	noopen	(dev_type_open((*))) enodev
 #define	noclose	(dev_type_close((*))) enodev
@@ -62,9 +62,9 @@ typedef int d_ioctl_t __P((dev_t, u_long, caddr_t, int, struct proc *));
 #endif /* __NetBSD__ || __OpenBSD__ */
 
 #if defined(__OpenBSD__)
-int altqopen __P((dev_t, int, int, struct proc *));
-int altqclose __P((dev_t, int, int, struct proc *));
-int altqioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
+int altqopen(dev_t, int, int, struct proc *);
+int altqclose(dev_t, int, int, struct proc *);
+int altqioctl(dev_t, u_long, caddr_t, int, struct proc *);
 #endif
 
 /*
@@ -98,9 +98,9 @@ moduledata_t name##_mod = {						\
 };									\
 DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE+96)
 
-void altq_module_incref __P((int));
-void altq_module_declref __P((int));
-int altq_module_handler __P((module_t, int, void *));
+void altq_module_incref(int);
+void altq_module_declref(int);
+int altq_module_handler(module_t, int, void *);
 
 #endif /* ALTQ_KLD */
 
diff --git a/sys/altq/altq_fifoq.c b/sys/altq/altq_fifoq.c
index 553f0339ebd..4649dcd3659 100644
--- a/sys/altq/altq_fifoq.c
+++ b/sys/altq/altq_fifoq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_fifoq.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_fifoq.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_fifoq.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -58,12 +58,12 @@
 static fifoq_state_t *fifoq_list = NULL;
 
 /* internal function prototypes */
-static int		fifoq_enqueue __P((struct ifaltq *, struct mbuf *,
-					   struct altq_pktattr *));
-static struct mbuf 	*fifoq_dequeue __P((struct ifaltq *, int));
-static int 		fifoq_detach __P((fifoq_state_t *));
-static int		fifoq_request __P((struct ifaltq *, int, void *));
-static void 		fifoq_purge __P((fifoq_state_t *));
+static int		fifoq_enqueue(struct ifaltq *, struct mbuf *,
+					   struct altq_pktattr *);
+static struct mbuf 	*fifoq_dequeue(struct ifaltq *, int);
+static int 		fifoq_detach(fifoq_state_t *);
+static int		fifoq_request(struct ifaltq *, int, void *);
+static void 		fifoq_purge(fifoq_state_t *);
 
 /*
  * fifoq device interface
diff --git a/sys/altq/altq_hfsc.c b/sys/altq/altq_hfsc.c
index b49cd9acb81..75b9ad11f64 100644
--- a/sys/altq/altq_hfsc.c
+++ b/sys/altq/altq_hfsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_hfsc.c,v 1.3 2001/10/26 07:36:46 kjc Exp $	*/
+/*	$OpenBSD: altq_hfsc.c,v 1.4 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_hfsc.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -61,77 +61,77 @@
 /*
  * function prototypes
  */
-static struct hfsc_if *hfsc_attach __P((struct ifaltq *, u_int));
-static int hfsc_detach __P((struct hfsc_if *));
-static int hfsc_clear_interface __P((struct hfsc_if *));
-static int hfsc_request __P((struct ifaltq *, int, void *));
-static void hfsc_purge __P((struct hfsc_if *));
-static struct hfsc_class *hfsc_class_create __P((struct hfsc_if *,
-		 struct service_curve *, struct hfsc_class *, int, int));
-static int hfsc_class_destroy __P((struct hfsc_class *));
-static int hfsc_class_modify __P((struct hfsc_class *,
-			  struct service_curve *, struct service_curve *));
-static struct hfsc_class *hfsc_nextclass __P((struct hfsc_class *));
-
-static int hfsc_enqueue __P((struct ifaltq *, struct mbuf *,
-			     struct altq_pktattr *));
-static struct mbuf *hfsc_dequeue __P((struct ifaltq *, int));
-
-static int hfsc_addq __P((struct hfsc_class *, struct mbuf *));
-static struct mbuf *hfsc_getq __P((struct hfsc_class *));
-static struct mbuf *hfsc_pollq __P((struct hfsc_class *));
-static void hfsc_purgeq __P((struct hfsc_class *));
-
-static void set_active __P((struct hfsc_class *, int));
-static void set_passive __P((struct hfsc_class *));
-
-static void init_ed __P((struct hfsc_class *, int));
-static void update_ed __P((struct hfsc_class *, int));
-static void update_d __P((struct hfsc_class *, int));
-static void init_v __P((struct hfsc_class *, int));
-static void update_v __P((struct hfsc_class *, int));
-static ellist_t *ellist_alloc __P((void));
-static void ellist_destroy __P((ellist_t *));
-static void ellist_insert __P((struct hfsc_class *));
-static void ellist_remove __P((struct hfsc_class *));
-static void ellist_update __P((struct hfsc_class *));
-struct hfsc_class *ellist_get_mindl __P((ellist_t *));
-static actlist_t *actlist_alloc __P((void));
-static void actlist_destroy __P((actlist_t *));
-static void actlist_insert __P((struct hfsc_class *));
-static void actlist_remove __P((struct hfsc_class *));
-static void actlist_update __P((struct hfsc_class *));
-
-static __inline u_int64_t seg_x2y __P((u_int64_t, u_int64_t));
-static __inline u_int64_t seg_y2x __P((u_int64_t, u_int64_t));
-static __inline u_int64_t m2sm __P((u_int));
-static __inline u_int64_t m2ism __P((u_int));
-static __inline u_int64_t d2dx __P((u_int));
-static u_int sm2m __P((u_int64_t));
-static u_int dx2d __P((u_int64_t));
-
-static void sc2isc __P((struct service_curve *, struct internal_sc *));
-static void rtsc_init __P((struct runtime_sc *, struct internal_sc *,
-			   u_int64_t, u_int64_t));
-static u_int64_t rtsc_y2x __P((struct runtime_sc *, u_int64_t));
-static u_int64_t rtsc_x2y __P((struct runtime_sc *, u_int64_t));
-static void rtsc_min __P((struct runtime_sc *, struct internal_sc *,
-			  u_int64_t, u_int64_t));
-
-int hfscopen __P((dev_t, int, int, struct proc *));
-int hfscclose __P((dev_t, int, int, struct proc *));
-int hfscioctl __P((dev_t, ioctlcmd_t, caddr_t, int, struct proc *));
-static int hfsccmd_if_attach __P((struct hfsc_attach *));
-static int hfsccmd_if_detach __P((struct hfsc_interface *));
-static int hfsccmd_add_class __P((struct hfsc_add_class *));
-static int hfsccmd_delete_class __P((struct hfsc_delete_class *));
-static int hfsccmd_modify_class __P((struct hfsc_modify_class *));
-static int hfsccmd_add_filter __P((struct hfsc_add_filter *));
-static int hfsccmd_delete_filter __P((struct hfsc_delete_filter *));
-static int hfsccmd_class_stats __P((struct hfsc_class_stats *));
-static void get_class_stats __P((struct class_stats *, struct hfsc_class *));
-static struct hfsc_class *clh_to_clp __P((struct hfsc_if *, u_long));
-static u_long clp_to_clh __P((struct hfsc_class *));
+static struct hfsc_if *hfsc_attach(struct ifaltq *, u_int);
+static int hfsc_detach(struct hfsc_if *);
+static int hfsc_clear_interface(struct hfsc_if *);
+static int hfsc_request(struct ifaltq *, int, void *);
+static void hfsc_purge(struct hfsc_if *);
+static struct hfsc_class *hfsc_class_create(struct hfsc_if *,
+		 struct service_curve *, struct hfsc_class *, int, int);
+static int hfsc_class_destroy(struct hfsc_class *);
+static int hfsc_class_modify(struct hfsc_class *,
+			  struct service_curve *, struct service_curve *);
+static struct hfsc_class *hfsc_nextclass(struct hfsc_class *);
+
+static int hfsc_enqueue(struct ifaltq *, struct mbuf *,
+			     struct altq_pktattr *);
+static struct mbuf *hfsc_dequeue(struct ifaltq *, int);
+
+static int hfsc_addq(struct hfsc_class *, struct mbuf *);
+static struct mbuf *hfsc_getq(struct hfsc_class *);
+static struct mbuf *hfsc_pollq(struct hfsc_class *);
+static void hfsc_purgeq(struct hfsc_class *);
+
+static void set_active(struct hfsc_class *, int);
+static void set_passive(struct hfsc_class *);
+
+static void init_ed(struct hfsc_class *, int);
+static void update_ed(struct hfsc_class *, int);
+static void update_d(struct hfsc_class *, int);
+static void init_v(struct hfsc_class *, int);
+static void update_v(struct hfsc_class *, int);
+static ellist_t *ellist_alloc(void);
+static void ellist_destroy(ellist_t *);
+static void ellist_insert(struct hfsc_class *);
+static void ellist_remove(struct hfsc_class *);
+static void ellist_update(struct hfsc_class *);
+struct hfsc_class *ellist_get_mindl(ellist_t *);
+static actlist_t *actlist_alloc(void);
+static void actlist_destroy(actlist_t *);
+static void actlist_insert(struct hfsc_class *);
+static void actlist_remove(struct hfsc_class *);
+static void actlist_update(struct hfsc_class *);
+
+static __inline u_int64_t seg_x2y(u_int64_t, u_int64_t);
+static __inline u_int64_t seg_y2x(u_int64_t, u_int64_t);
+static __inline u_int64_t m2sm(u_int);
+static __inline u_int64_t m2ism(u_int);
+static __inline u_int64_t d2dx(u_int);
+static u_int sm2m(u_int64_t);
+static u_int dx2d(u_int64_t);
+
+static void sc2isc(struct service_curve *, struct internal_sc *);
+static void rtsc_init(struct runtime_sc *, struct internal_sc *,
+			   u_int64_t, u_int64_t);
+static u_int64_t rtsc_y2x(struct runtime_sc *, u_int64_t);
+static u_int64_t rtsc_x2y(struct runtime_sc *, u_int64_t);
+static void rtsc_min(struct runtime_sc *, struct internal_sc *,
+			  u_int64_t, u_int64_t);
+
+int hfscopen(dev_t, int, int, struct proc *);
+int hfscclose(dev_t, int, int, struct proc *);
+int hfscioctl(dev_t, ioctlcmd_t, caddr_t, int, struct proc *);
+static int hfsccmd_if_attach(struct hfsc_attach *);
+static int hfsccmd_if_detach(struct hfsc_interface *);
+static int hfsccmd_add_class(struct hfsc_add_class *);
+static int hfsccmd_delete_class(struct hfsc_delete_class *);
+static int hfsccmd_modify_class(struct hfsc_modify_class *);
+static int hfsccmd_add_filter(struct hfsc_add_filter *);
+static int hfsccmd_delete_filter(struct hfsc_delete_filter *);
+static int hfsccmd_class_stats(struct hfsc_class_stats *);
+static void get_class_stats(struct class_stats *, struct hfsc_class *);
+static struct hfsc_class *clh_to_clp(struct hfsc_if *, u_long);
+static u_long clp_to_clh(struct hfsc_class *);
 
 /*
  * macros
diff --git a/sys/altq/altq_priq.c b/sys/altq/altq_priq.c
index 3d12e71ca60..9d704184a54 100644
--- a/sys/altq/altq_priq.c
+++ b/sys/altq/altq_priq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_priq.c,v 1.3 2001/10/26 07:36:46 kjc Exp $	*/
+/*	$OpenBSD: altq_priq.c,v 1.4 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_priq.c,v 1.1 2000/10/18 09:15:23 kjc Exp $	*/
 /*
  * Copyright (C) 2000
@@ -50,37 +50,37 @@
 /*
  * function prototypes
  */
-static struct priq_if *priq_attach __P((struct ifaltq *, u_int));
-static int priq_detach __P((struct priq_if *));
-static int priq_clear_interface __P((struct priq_if *));
-static int priq_request __P((struct ifaltq *, int, void *));
-static void priq_purge __P((struct priq_if *));
-static struct priq_class *priq_class_create __P((struct priq_if *,
-						 int, int, int));
-static int priq_class_destroy __P((struct priq_class *));
-static int priq_enqueue __P((struct ifaltq *, struct mbuf *,
-			     struct altq_pktattr *));
-static struct mbuf *priq_dequeue __P((struct ifaltq *, int));
-
-static int priq_addq __P((struct priq_class *, struct mbuf *));
-static struct mbuf *priq_getq __P((struct priq_class *));
-static struct mbuf *priq_pollq __P((struct priq_class *));
-static void priq_purgeq __P((struct priq_class *));
-
-int priqopen __P((dev_t, int, int, struct proc *));
-int priqclose __P((dev_t, int, int, struct proc *));
-int priqioctl __P((dev_t, ioctlcmd_t, caddr_t, int, struct proc *));
-static int priqcmd_if_attach __P((struct priq_interface *));
-static int priqcmd_if_detach __P((struct priq_interface *));
-static int priqcmd_add_class __P((struct priq_add_class *));
-static int priqcmd_delete_class __P((struct priq_delete_class *));
-static int priqcmd_modify_class __P((struct priq_modify_class *));
-static int priqcmd_add_filter __P((struct priq_add_filter *));
-static int priqcmd_delete_filter __P((struct priq_delete_filter *));
-static int priqcmd_class_stats __P((struct priq_class_stats *));
-static void get_class_stats __P((struct class_stats *, struct priq_class *));
-static struct priq_class *clh_to_clp __P((struct priq_if *, u_long));
-static u_long clp_to_clh __P((struct priq_class *));
+static struct priq_if *priq_attach(struct ifaltq *, u_int);
+static int priq_detach(struct priq_if *);
+static int priq_clear_interface(struct priq_if *);
+static int priq_request(struct ifaltq *, int, void *);
+static void priq_purge(struct priq_if *);
+static struct priq_class *priq_class_create(struct priq_if *,
+						 int, int, int);
+static int priq_class_destroy(struct priq_class *);
+static int priq_enqueue(struct ifaltq *, struct mbuf *,
+			     struct altq_pktattr *);
+static struct mbuf *priq_dequeue(struct ifaltq *, int);
+
+static int priq_addq(struct priq_class *, struct mbuf *);
+static struct mbuf *priq_getq(struct priq_class *);
+static struct mbuf *priq_pollq(struct priq_class *);
+static void priq_purgeq(struct priq_class *);
+
+int priqopen(dev_t, int, int, struct proc *);
+int priqclose(dev_t, int, int, struct proc *);
+int priqioctl(dev_t, ioctlcmd_t, caddr_t, int, struct proc *);
+static int priqcmd_if_attach(struct priq_interface *);
+static int priqcmd_if_detach(struct priq_interface *);
+static int priqcmd_add_class(struct priq_add_class *);
+static int priqcmd_delete_class(struct priq_delete_class *);
+static int priqcmd_modify_class(struct priq_modify_class *);
+static int priqcmd_add_filter(struct priq_add_filter *);
+static int priqcmd_delete_filter(struct priq_delete_filter *);
+static int priqcmd_class_stats(struct priq_class_stats *);
+static void get_class_stats(struct class_stats *, struct priq_class *);
+static struct priq_class *clh_to_clp(struct priq_if *, u_long);
+static u_long clp_to_clh(struct priq_class *);
 
 /* pif_list keeps all priq_if's allocated. */
 static struct priq_if *pif_list = NULL;
diff --git a/sys/altq/altq_red.c b/sys/altq/altq_red.c
index 0d904c76236..70d7ec18097 100644
--- a/sys/altq/altq_red.c
+++ b/sys/altq/altq_red.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_red.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_red.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_red.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -180,26 +180,26 @@ static int default_th_max = TH_MAX;
 static int default_inv_pmax = INV_P_MAX;
 
 /* internal function prototypes */
-static int red_enqueue __P((struct ifaltq *, struct mbuf *,
-			    struct altq_pktattr *));
-static struct mbuf *red_dequeue __P((struct ifaltq *, int));
-static int red_request __P((struct ifaltq *, int, void *));
-static void red_purgeq __P((red_queue_t *));
-static int red_detach __P((red_queue_t *));
+static int red_enqueue(struct ifaltq *, struct mbuf *,
+			    struct altq_pktattr *);
+static struct mbuf *red_dequeue(struct ifaltq *, int);
+static int red_request(struct ifaltq *, int, void *);
+static void red_purgeq(red_queue_t *);
+static int red_detach(red_queue_t *);
 #ifdef ALTQ_FLOWVALVE
-static __inline struct fve *flowlist_lookup __P((struct flowvalve *,
-			 struct altq_pktattr *, struct timeval *));
-static __inline struct fve *flowlist_reclaim __P((struct flowvalve *,
-						  struct altq_pktattr *));
-static __inline void flowlist_move_to_head __P((struct flowvalve *,
-						struct fve *));
-static __inline int fv_p2f __P((struct flowvalve *, int));
-static struct flowvalve *fv_alloc __P((struct red *));
-static void fv_destroy __P((struct flowvalve *));
-static int fv_checkflow __P((struct flowvalve *, struct altq_pktattr *,
-			     struct fve **));
-static void fv_dropbyred __P((struct flowvalve *fv, struct altq_pktattr *,
-			      struct fve *));
+static __inline struct fve *flowlist_lookup(struct flowvalve *,
+			 struct altq_pktattr *, struct timeval *);
+static __inline struct fve *flowlist_reclaim(struct flowvalve *,
+						  struct altq_pktattr *);
+static __inline void flowlist_move_to_head(struct flowvalve *,
+						struct fve *);
+static __inline int fv_p2f(struct flowvalve *, int);
+static struct flowvalve *fv_alloc(struct red *);
+static void fv_destroy(struct flowvalve *);
+static int fv_checkflow(struct flowvalve *, struct altq_pktattr *,
+			     struct fve **);
+static void fv_dropbyred(struct flowvalve *fv, struct altq_pktattr *,
+			      struct fve *);
 #endif
 
 /*
diff --git a/sys/altq/altq_red.h b/sys/altq/altq_red.h
index ba671c42ee8..08edbabd624 100644
--- a/sys/altq/altq_red.h
+++ b/sys/altq/altq_red.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_red.h,v 1.1 2001/06/27 05:28:36 kjc Exp $	*/
+/*	$OpenBSD: altq_red.h,v 1.2 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_red.h,v 1.5 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -173,17 +173,17 @@ typedef struct red_queue {
 #define	DTYPE_FORCED	1	/* a "forced" drop */
 #define	DTYPE_EARLY	2	/* an "unforced" (early) drop */
 
-extern red_t *red_alloc __P((int, int, int, int, int, int));
-extern void red_destroy __P((red_t *));
-extern void red_getstats __P((red_t *, struct redstats *));
-extern int red_addq __P((red_t *, class_queue_t *, struct mbuf *,
-			 struct altq_pktattr *));
-extern struct mbuf *red_getq __P((red_t *, class_queue_t *));
-extern int drop_early __P((int, int, int));
-extern int mark_ecn __P((struct mbuf *, struct altq_pktattr *, int));
-extern struct wtab *wtab_alloc __P((int));
-extern int wtab_destroy __P((struct wtab *));
-extern int32_t pow_w __P((struct wtab *, int));
+extern red_t *red_alloc(int, int, int, int, int, int);
+extern void red_destroy(red_t *);
+extern void red_getstats(red_t *, struct redstats *);
+extern int red_addq(red_t *, class_queue_t *, struct mbuf *,
+			 struct altq_pktattr *);
+extern struct mbuf *red_getq(red_t *, class_queue_t *);
+extern int drop_early(int, int, int);
+extern int mark_ecn(struct mbuf *, struct altq_pktattr *, int);
+extern struct wtab *wtab_alloc(int);
+extern int wtab_destroy(struct wtab *);
+extern int32_t pow_w(struct wtab *, int);
 
 #endif /* _KERNEL */
 
diff --git a/sys/altq/altq_rio.c b/sys/altq/altq_rio.c
index b9a6d5575d0..65f55cb822f 100644
--- a/sys/altq/altq_rio.c
+++ b/sys/altq/altq_rio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rio.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_rio.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_rio.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -169,12 +169,12 @@ static struct redparams default_rio_params[RIO_NDROPPREC] = {
 };
 
 /* internal function prototypes */
-static int rio_enqueue __P((struct ifaltq *, struct mbuf *,
-			    struct altq_pktattr *));
-static struct mbuf *rio_dequeue __P((struct ifaltq *, int));
-static int rio_request __P((struct ifaltq *, int, void *));
-static int rio_detach __P((rio_queue_t *));
-static int dscp2index __P((u_int8_t));
+static int rio_enqueue(struct ifaltq *, struct mbuf *,
+			    struct altq_pktattr *);
+static struct mbuf *rio_dequeue(struct ifaltq *, int);
+static int rio_request(struct ifaltq *, int, void *);
+static int rio_detach(rio_queue_t *);
+static int dscp2index(u_int8_t);
 
 /*
  * rio device interface
diff --git a/sys/altq/altq_rio.h b/sys/altq/altq_rio.h
index 02d6f24fa08..e96411f7a1b 100644
--- a/sys/altq/altq_rio.h
+++ b/sys/altq/altq_rio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rio.h,v 1.1 2001/06/27 05:28:36 kjc Exp $	*/
+/*	$OpenBSD: altq_rio.h,v 1.2 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_rio.h,v 1.5 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -127,13 +127,13 @@ typedef struct rio_queue {
 	rio_t *rq_rio;
 } rio_queue_t;
 
-extern rio_t *rio_alloc __P((int, struct redparams *, int, int));
-extern void rio_destroy __P((rio_t *));
-extern void rio_getstats __P((rio_t *, struct redstats *));
-extern int rio_addq __P((rio_t *, class_queue_t *, struct mbuf *,
-			 struct altq_pktattr *));
-extern struct mbuf *rio_getq __P((rio_t *, class_queue_t *));
-extern int rio_set_meter __P((rio_t *, int, int, int));
+extern rio_t *rio_alloc(int, struct redparams *, int, int);
+extern void rio_destroy(rio_t *);
+extern void rio_getstats(rio_t *, struct redstats *);
+extern int rio_addq(rio_t *, class_queue_t *, struct mbuf *,
+			 struct altq_pktattr *);
+extern struct mbuf *rio_getq(rio_t *, class_queue_t *);
+extern int rio_set_meter(rio_t *, int, int, int);
 
 #endif /* _KERNEL */
 
diff --git a/sys/altq/altq_rmclass.c b/sys/altq/altq_rmclass.c
index 5435267d574..447a6af8b34 100644
--- a/sys/altq/altq_rmclass.c
+++ b/sys/altq/altq_rmclass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rmclass.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_rmclass.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_rmclass.c,v 1.10 2001/02/09 07:20:40 kjc Exp $	*/
 
 /*
@@ -67,24 +67,24 @@
  * Local routines.
  */
 
-static int	rmc_satisfied __P((struct rm_class *, struct timeval *));
-static void	rmc_wrr_set_weights __P((struct rm_ifdat *));
-static void	rmc_depth_compute __P((struct rm_class *));
-static void	rmc_depth_recompute __P((rm_class_t *));
+static int	rmc_satisfied(struct rm_class *, struct timeval *);
+static void	rmc_wrr_set_weights(struct rm_ifdat *);
+static void	rmc_depth_compute(struct rm_class *);
+static void	rmc_depth_recompute(rm_class_t *);
 
-static mbuf_t	*_rmc_wrr_dequeue_next __P((struct rm_ifdat *, int));
-static mbuf_t	*_rmc_prr_dequeue_next __P((struct rm_ifdat *, int));
+static mbuf_t	*_rmc_wrr_dequeue_next(struct rm_ifdat *, int);
+static mbuf_t	*_rmc_prr_dequeue_next(struct rm_ifdat *, int);
 
-static int	_rmc_addq __P((rm_class_t *, mbuf_t *));
-static void	_rmc_dropq __P((rm_class_t *));
-static mbuf_t	*_rmc_getq __P((rm_class_t *));
-static mbuf_t	*_rmc_pollq __P((rm_class_t *));
+static int	_rmc_addq(rm_class_t *, mbuf_t *);
+static void	_rmc_dropq(rm_class_t *);
+static mbuf_t	*_rmc_getq(rm_class_t *);
+static mbuf_t	*_rmc_pollq(rm_class_t *);
 
-static int	rmc_under_limit __P((struct rm_class *, struct timeval *));
-static void	rmc_tl_satisfied __P((struct rm_ifdat *, struct timeval *));
-static void	rmc_drop_action __P((struct rm_class *));
-static void	rmc_restart __P((struct rm_class *));
-static void	rmc_root_overlimit __P((struct rm_class *, struct rm_class *));
+static int	rmc_under_limit(struct rm_class *, struct timeval *);
+static void	rmc_tl_satisfied(struct rm_ifdat *, struct timeval *);
+static void	rmc_drop_action(struct rm_class *);
+static void	rmc_restart(struct rm_class *);
+static void	rmc_root_overlimit(struct rm_class *, struct rm_class *);
 
 #define	BORROW_OFFTIME
 /*
@@ -1469,7 +1469,7 @@ void rmc_dropall(cl)
 
 #if (__FreeBSD_version > 300000)
 /* hzto() is removed from FreeBSD-3.0 */
-static int hzto __P((struct timeval *));
+static int hzto(struct timeval *);
 
 static int
 hzto(tv)
diff --git a/sys/altq/altq_rmclass.h b/sys/altq/altq_rmclass.h
index cb171c67064..077e1279c55 100644
--- a/sys/altq/altq_rmclass.h
+++ b/sys/altq/altq_rmclass.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rmclass.h,v 1.2 2002/02/13 08:07:57 kjc Exp $	*/
+/*	$OpenBSD: altq_rmclass.h,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_rmclass.h,v 1.6 2000/12/09 09:22:44 kjc Exp $	*/
 
 /*
@@ -245,18 +245,18 @@ extern rm_class_t *rmc_newclass __P((int, struct rm_ifdat *, u_int,
 					      struct rm_class *),
 				     int, struct rm_class *, struct rm_class *,
 				     u_int, int, u_int, int, int));
-extern void	rmc_delete_class __P((struct rm_ifdat *, struct rm_class *));
-extern int 	rmc_modclass __P((struct rm_class *, u_int, int,
-				  u_int, int, u_int, int));
+extern void	rmc_delete_class(struct rm_ifdat *, struct rm_class *);
+extern int 	rmc_modclass(struct rm_class *, u_int, int,
+				  u_int, int, u_int, int);
 extern void	rmc_init __P((struct ifaltq *, struct rm_ifdat *, u_int,
 			      void (*)(struct ifaltq *),
 			      int, int, u_int, int, u_int, int));
-extern int	rmc_queue_packet __P((struct rm_class *, mbuf_t *));
-extern mbuf_t	*rmc_dequeue_next __P((struct rm_ifdat *, int));
-extern void	rmc_update_class_util __P((struct rm_ifdat *));
-extern void	rmc_delay_action __P((struct rm_class *, struct rm_class *));
-extern void	rmc_dropall __P((struct rm_class *));
-extern int	rmc_get_weight __P((struct rm_ifdat *, int));
+extern int	rmc_queue_packet(struct rm_class *, mbuf_t *);
+extern mbuf_t	*rmc_dequeue_next(struct rm_ifdat *, int);
+extern void	rmc_update_class_util(struct rm_ifdat *);
+extern void	rmc_delay_action(struct rm_class *, struct rm_class *);
+extern void	rmc_dropall(struct rm_class *);
+extern int	rmc_get_weight(struct rm_ifdat *, int);
 
 #endif /* _KERNEL */
 
diff --git a/sys/altq/altq_subr.c b/sys/altq/altq_subr.c
index 399cfd7f38f..ad897776ba3 100644
--- a/sys/altq/altq_subr.c
+++ b/sys/altq/altq_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_subr.c,v 1.5 2002/02/13 08:11:48 kjc Exp $	*/
+/*	$OpenBSD: altq_subr.c,v 1.6 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_subr.c,v 1.11 2002/01/11 08:11:49 kjc Exp $	*/
 
 /*
@@ -74,35 +74,35 @@
 /*
  * internal function prototypes
  */
-static void	tbr_timeout __P((void *));
-static int 	extract_ports4 __P((struct mbuf *, struct ip *,
-				    struct flowinfo_in *));
+static void	tbr_timeout(void *);
+static int 	extract_ports4(struct mbuf *, struct ip *,
+				    struct flowinfo_in *);
 #ifdef INET6
-static int 	extract_ports6 __P((struct mbuf *, struct ip6_hdr *,
-				    struct flowinfo_in6 *));
+static int 	extract_ports6(struct mbuf *, struct ip6_hdr *,
+				    struct flowinfo_in6 *);
 #endif
-static int	apply_filter4 __P((u_int32_t, struct flow_filter *,
-				   struct flowinfo_in *));
-static int	apply_ppfilter4 __P((u_int32_t, struct flow_filter *,
-				     struct flowinfo_in *));
+static int	apply_filter4(u_int32_t, struct flow_filter *,
+				   struct flowinfo_in *);
+static int	apply_ppfilter4(u_int32_t, struct flow_filter *,
+				     struct flowinfo_in *);
 #ifdef INET6
-static int	apply_filter6 __P((u_int32_t, struct flow_filter6 *,
-					   struct flowinfo_in6 *));
+static int	apply_filter6(u_int32_t, struct flow_filter6 *,
+					   struct flowinfo_in6 *);
 #endif
-static int	apply_tosfilter4 __P((u_int32_t, struct flow_filter *,
-					     struct flowinfo_in *));
-static u_long	get_filt_handle __P((struct acc_classifier *, int));
-static struct acc_filter *filth_to_filtp __P((struct acc_classifier *,
-					      u_long));
-static u_int32_t filt2fibmask __P((struct flow_filter *));
-
-static void 	ip4f_cache __P((struct ip *, struct flowinfo_in *));
-static int 	ip4f_lookup __P((struct ip *, struct flowinfo_in *));
-static int 	ip4f_init __P((void));
-static struct ip4_frag	*ip4f_alloc __P((void));
-static void 	ip4f_free __P((struct ip4_frag *));
-
-int (*altq_input) __P((struct mbuf *, int)) = NULL;
+static int	apply_tosfilter4(u_int32_t, struct flow_filter *,
+					     struct flowinfo_in *);
+static u_long	get_filt_handle(struct acc_classifier *, int);
+static struct acc_filter *filth_to_filtp(struct acc_classifier *,
+					      u_long);
+static u_int32_t filt2fibmask(struct flow_filter *);
+
+static void 	ip4f_cache(struct ip *, struct flowinfo_in *);
+static int 	ip4f_lookup(struct ip *, struct flowinfo_in *);
+static int 	ip4f_init(void);
+static struct ip4_frag	*ip4f_alloc(void);
+static void 	ip4f_free(struct ip4_frag *);
+
+int (*altq_input)(struct mbuf *, int) = NULL;
 static int tbr_timer = 0;	/* token bucket regulator timer */
 static struct callout tbr_callout = CALLOUT_INITIALIZER;
 
diff --git a/sys/altq/altq_var.h b/sys/altq/altq_var.h
index 98e192f21ba..a10764dde84 100644
--- a/sys/altq/altq_var.h
+++ b/sys/altq/altq_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_var.h,v 1.2 2002/02/13 08:06:14 kjc Exp $	*/
+/*	$OpenBSD: altq_var.h,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_var.h,v 1.8 2001/02/09 09:44:41 kjc Exp $	*/
 
 /*
@@ -211,7 +211,7 @@ struct callout {
 /* dummy callout structure */
 struct callout {
 	void		*c_arg;			/* function argument */
-	void		(*c_func) __P((void *));/* functiuon to call */
+	void		(*c_func)(void *);/* functiuon to call */
 };
 #define	CALLOUT_INIT(c)		do { bzero((c), sizeof(*(c))); } while (0)
 #define	CALLOUT_RESET(c,t,f,a)	do {	(c)->c_arg = (a);	\
@@ -228,18 +228,18 @@ typedef void (timeout_t)(void *);
 
 struct ifnet; struct mbuf; struct flowinfo;
 
-void *altq_lookup __P((char *, int));
-int altq_extractflow __P((struct mbuf *, int, struct flowinfo *, u_int32_t));
-int acc_add_filter __P((struct acc_classifier *, struct flow_filter *,
-			   void *, u_long *));
-int acc_delete_filter __P((struct acc_classifier *, u_long));
-int acc_discard_filters __P((struct acc_classifier *, void *, int));
-void *acc_classify __P((void *, struct mbuf *, int));
-u_int8_t read_dsfield __P((struct mbuf *, struct altq_pktattr *));
-void write_dsfield __P((struct mbuf *, struct altq_pktattr *, u_int8_t));
-void altq_assert __P((const char *, int, const char *));
-int tbr_set __P((struct ifaltq *, struct tb_profile *));
-int tbr_get __P((struct ifaltq *, struct tb_profile *));
+void *altq_lookup(char *, int);
+int altq_extractflow(struct mbuf *, int, struct flowinfo *, u_int32_t);
+int acc_add_filter(struct acc_classifier *, struct flow_filter *,
+			   void *, u_long *);
+int acc_delete_filter(struct acc_classifier *, u_long);
+int acc_discard_filters(struct acc_classifier *, void *, int);
+void *acc_classify(void *, struct mbuf *, int);
+u_int8_t read_dsfield(struct mbuf *, struct altq_pktattr *);
+void write_dsfield(struct mbuf *, struct altq_pktattr *, u_int8_t);
+void altq_assert(const char *, int, const char *);
+int tbr_set(struct ifaltq *, struct tb_profile *);
+int tbr_get(struct ifaltq *, struct tb_profile *);
 
 #endif /* _KERNEL */
 #endif /* _ALTQ_ALTQ_VAR_H_ */
diff --git a/sys/altq/altq_wfq.c b/sys/altq/altq_wfq.c
index d319b10e2a1..95b613639a0 100644
--- a/sys/altq/altq_wfq.c
+++ b/sys/altq/altq_wfq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_wfq.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $	*/
+/*	$OpenBSD: altq_wfq.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: altq_wfq.c,v 1.7 2000/12/14 08:12:46 thorpej Exp $	*/
 
 /*
@@ -69,7 +69,7 @@ static int		wfq_getqid(struct wfq_getqid *);
 static int		wfq_setweight(struct wfq_setweight *);
 static int		wfq_getstats(struct wfq_getstats *);
 static int		wfq_config(struct wfq_conf *);
-static int		wfq_request __P((struct ifaltq *, int, void *));
+static int		wfq_request(struct ifaltq *, int, void *);
 static int		wfq_flush(struct ifaltq *);
 static void		*wfq_classify(void *, struct mbuf *, int);
 
diff --git a/sys/altq/if_altq.h b/sys/altq/if_altq.h
index 055e956e454..bf1cbf369cf 100644
--- a/sys/altq/if_altq.h
+++ b/sys/altq/if_altq.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_altq.h,v 1.2 2002/03/01 05:06:24 kjc Exp $	*/
+/*	$OpenBSD: if_altq.h,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
 /*	$KAME: if_altq.h,v 1.6 2001/01/29 19:59:09 itojun Exp $	*/
 
 /*
@@ -54,14 +54,14 @@ struct	ifaltq {
 	void	*altq_disc;		/* for discipline-specific use */
 	struct	ifnet *altq_ifp;	/* back pointer to interface */
 
-	int	(*altq_enqueue) __P((struct ifaltq *, struct mbuf *,
-				     struct altq_pktattr *));
-	struct	mbuf *(*altq_dequeue) __P((struct ifaltq *, int));
-	int	(*altq_request) __P((struct ifaltq *, int, void *));
+	int	(*altq_enqueue)(struct ifaltq *, struct mbuf *,
+				     struct altq_pktattr *);
+	struct	mbuf *(*altq_dequeue)(struct ifaltq *, int);
+	int	(*altq_request)(struct ifaltq *, int, void *);
 
 	/* classifier fields */
 	void	*altq_clfier;		/* classifier-specific use */
-	void	*(*altq_classify) __P((void *, struct mbuf *, int));
+	void	*(*altq_classify)(void *, struct mbuf *, int);
 
 	/* token bucket regulator */
 	struct	tb_regulator *altq_tbr;
@@ -155,11 +155,11 @@ extern int altq_attach __P((struct ifaltq *, int, void *,
 			    int (*)(struct ifaltq *, int, void *),
 			    void *,
 			    void *(*)(void *, struct mbuf *, int)));
-extern int altq_detach __P((struct ifaltq *));
-extern int altq_enable __P((struct ifaltq *));
-extern int altq_disable __P((struct ifaltq *));
-extern struct mbuf *tbr_dequeue __P((struct ifaltq *, int));
-extern int (*altq_input) __P((struct mbuf *, int));
+extern int altq_detach(struct ifaltq *);
+extern int altq_enable(struct ifaltq *);
+extern int altq_disable(struct ifaltq *);
+extern struct mbuf *tbr_dequeue(struct ifaltq *, int);
+extern int (*altq_input)(struct mbuf *, int);
 void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
 
 #endif /* _KERNEL */