Module Name: src
Committed By: bouyer
Date: Sun May 8 13:51:31 UTC 2011
Modified Files:
src/sys/netatalk: aarp.c aarp.h ddp_usrreq.c
Log Message:
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().
Should fix PR kern/44734
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/netatalk/aarp.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netatalk/aarp.h
cvs rdiff -u -r1.39 -r1.40 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.34 src/sys/netatalk/aarp.c:1.35
--- src/sys/netatalk/aarp.c:1.34 Sat Sep 12 20:43:18 2009
+++ src/sys/netatalk/aarp.c Sun May 8 13:51:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aarp.c,v 1.34 2009/09/12 20:43:18 tsutsui Exp $ */
+/* $NetBSD: aarp.c,v 1.35 2011/05/08 13:51:31 bouyer 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.34 2009/09/12 20:43:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.35 2011/05/08 13:51:31 bouyer Exp $");
#include "opt_mbuftrace.h"
@@ -508,7 +508,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.3
--- src/sys/netatalk/aarp.h:1.2 Sat Dec 10 23:29:05 2005
+++ src/sys/netatalk/aarp.h Sun May 8 13:51:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aarp.h,v 1.2 2005/12/10 23:29:05 elad Exp $ */
+/* $NetBSD: aarp.h,v 1.3 2011/05/08 13:51:31 bouyer 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.39 src/sys/netatalk/ddp_usrreq.c:1.40
--- src/sys/netatalk/ddp_usrreq.c:1.39 Thu Apr 16 21:37:17 2009
+++ src/sys/netatalk/ddp_usrreq.c Sun May 8 13:51:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_usrreq.c,v 1.39 2009/04/16 21:37:17 elad Exp $ */
+/* $NetBSD: ddp_usrreq.c,v 1.40 2011/05/08 13:51:31 bouyer 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.39 2009/04/16 21:37:17 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.40 2011/05/08 13:51:31 bouyer Exp $");
#include "opt_mbuftrace.h"
@@ -554,6 +554,7 @@
MOWNER_ATTACH(&atalk_tx_mowner);
MOWNER_ATTACH(&atalk_rx_mowner);
+ MOWNER_ATTACH(&aarp_mowner);
}
#if 0
