 @@ -1,14 +1,14 @@
-/*	$NetBSD: aarp.c,v 1.28 2009/03/14 15:36:23 dsl Exp $	*/
+/*	$NetBSD: aarp.c,v 1.29 2009/03/15 21:24:24 cegger Exp $	*/
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this software and
  * its documentation for any purpose and without fee is hereby granted,
  * provided that the above copyright notice appears in all copies and
  * that both that copyright notice and this permission notice appear
  * in supporting documentation, and that the name of The University
  * of Michigan not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior
  * permission. This software is supplied as is without expressed or
 @@ -17,27 +17,27 @@
  * This product includes software developed by the University of
  * California, Berkeley and its contributors.
+ *
  *	Research Systems Unix Group
  *	The University of Michigan
  *	c/o Wesley Craig
  *	535 W. William Street
  *	Ann Arbor, Michigan
  *	+1-313-764-2278
  *	netatalk@umich.edu
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.28 2009/03/14 15:36:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.29 2009/03/15 21:24:24 cegger Exp $");
 #include "opt_mbuftrace.h"
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/socketvar.h>
 @@ -622,23 +622,23 @@ aarpprobe(void *arp)
 	printf("aarp: sending probe for %u.%u\n",
 	       ntohs(AA_SAT(aa)->sat_addr.s_net),
 	       AA_SAT(aa)->sat_addr.s_node);
 #endif	/* NETATALKDEBUG */
 	sa.sa_len = sizeof(struct sockaddr);
 	sa.sa_family = AF_UNSPEC;
 	(*ifp->if_output) (ifp, m, &sa, NULL);	/* XXX */
 	aa->aa_probcnt--;
 	mutex_exit(softnet_lock);
+}
 void
-aarp_clean()
+aarp_clean(void)
+{
 	struct aarptab *aat;
 	int             i;
 	callout_stop(&aarptimer_callout);
 	for (i = 0, aat = aarptab; i < AARPTAB_SIZE; i++, aat++)
 		if (aat->aat_hold)
 			m_freem(aat->aat_hold);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ddp_input.c,v 1.21 2009/03/14 15:36:23 dsl Exp $	 */
+/*	$NetBSD: ddp_input.c,v 1.22 2009/03/15 21:24:24 cegger Exp $	 */
 /*
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this software and
  * its documentation for any purpose and without fee is hereby granted,
  * provided that the above copyright notice appears in all copies and
  * that both that copyright notice and this permission notice appear
  * in supporting documentation, and that the name of The University
  * of Michigan not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior
  * permission. This software is supplied as is without expressed or
 @@ -17,27 +17,27 @@
  * This product includes software developed by the University of
  * California, Berkeley and its contributors.
+ *
  *	Research Systems Unix Group
  *	The University of Michigan
  *	c/o Wesley Craig
  *	535 W. William Street
  *	Ann Arbor, Michigan
  *	+1-313-764-2278
  *	netatalk@umich.edu
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.21 2009/03/14 15:36:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.22 2009/03/15 21:24:24 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <net/netisr.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_ether.h>
 #include <netinet/in.h>
 @@ -49,27 +49,27 @@ __KERNEL_RCSID(0, "$NetBSD: ddp_input.c,
 #include <netatalk/ddp_private.h>
 #include <netatalk/at_extern.h>
 int             ddp_forward = 1;
 int             ddp_firewall = 0;
 extern int      ddp_cksum;
 void            ddp_input(struct mbuf *, struct ifnet *,
     struct elaphdr *, int);
 /*
  * Could probably merge these two code segments a little better...
  */
 void
-atintr()
+atintr(void)
+{
 	struct elaphdr *elhp, elh;
 	struct ifnet   *ifp;
 	struct mbuf    *m;
 	struct at_ifaddr *aa;
 	int             s;
 	mutex_enter(softnet_lock);
 	for (;;) {
 		s = splnet();
 		IF_DEQUEUE(&atintrq2, m);