Module Name: src
Committed By: sborrill
Date: Thu Jun 30 09:31:15 UTC 2011
Modified Files:
src/sys/netatalk [netbsd-5]: aarp.c aarp.h ddp_usrreq.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1622):
sys/netatalk/aarp.c: revision 1.35
sys/netatalk/aarp.h: revision 1.3
sys/netatalk/ddp_usrreq.c: revision 1.40
aarpprobe() is called before MOWNER_ATTACH(&aarp_mowner), leading
to a DIAGNOSTIC panic when MBUFTRACE is defined and atalkd is started.
Fix by moving MOWNER_ATTACH(&aarp_mowner) to ddp_init().
Fixes PR kern/44734
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.12.1 src/sys/netatalk/aarp.c
cvs rdiff -u -r1.2 -r1.2.86.1 src/sys/netatalk/aarp.h
cvs rdiff -u -r1.33 -r1.33.10.1 src/sys/netatalk/ddp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netatalk/aarp.c
diff -u src/sys/netatalk/aarp.c:1.27 src/sys/netatalk/aarp.c:1.27.12.1
--- src/sys/netatalk/aarp.c:1.27 Thu Apr 24 11:38:37 2008
+++ src/sys/netatalk/aarp.c Thu Jun 30 09:31:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aarp.c,v 1.27 2008/04/24 11:38:37 ad Exp $ */
+/* $NetBSD: aarp.c,v 1.27.12.1 2011/06/30 09:31:15 sborrill Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.27 2008/04/24 11:38:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.27.12.1 2011/06/30 09:31:15 sborrill Exp $");
#include "opt_mbuftrace.h"
@@ -511,7 +511,6 @@
first = 0;
callout_init(&aarptimer_callout, 0);
callout_reset(&aarptimer_callout, hz, aarptimer, NULL);
- MOWNER_ATTACH(&aarp_mowner);
}
aat = &aarptab[AARPTAB_HASH(*addr) * AARPTAB_BSIZ];
for (n = 0; n < AARPTAB_BSIZ; n++, aat++) {
Index: src/sys/netatalk/aarp.h
diff -u src/sys/netatalk/aarp.h:1.2 src/sys/netatalk/aarp.h:1.2.86.1
--- src/sys/netatalk/aarp.h:1.2 Sat Dec 10 23:29:05 2005
+++ src/sys/netatalk/aarp.h Thu Jun 30 09:31:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aarp.h,v 1.2 2005/12/10 23:29:05 elad Exp $ */
+/* $NetBSD: aarp.h,v 1.2.86.1 2011/06/30 09:31:15 sborrill Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -76,4 +76,6 @@
#define AARPOP_RESPONSE 0x02
#define AARPOP_PROBE 0x03
+extern struct mowner aarp_mowner;
+
#endif /* !_NETATALK_AARP_H_ */
Index: src/sys/netatalk/ddp_usrreq.c
diff -u src/sys/netatalk/ddp_usrreq.c:1.33 src/sys/netatalk/ddp_usrreq.c:1.33.10.1
--- src/sys/netatalk/ddp_usrreq.c:1.33 Sun May 4 07:22:14 2008
+++ src/sys/netatalk/ddp_usrreq.c Thu Jun 30 09:31:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_usrreq.c,v 1.33 2008/05/04 07:22:14 thorpej Exp $ */
+/* $NetBSD: ddp_usrreq.c,v 1.33.10.1 2011/06/30 09:31:15 sborrill Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.33 2008/05/04 07:22:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.33.10.1 2011/06/30 09:31:15 sborrill Exp $");
#include "opt_mbuftrace.h"
@@ -569,6 +569,7 @@
MOWNER_ATTACH(&atalk_tx_mowner);
MOWNER_ATTACH(&atalk_rx_mowner);
+ MOWNER_ATTACH(&aarp_mowner);
}
#if 0
