Date: Wed, 16 Jan 2002 01:41:10 +0000 From: Ian Dowse <iedowse@maths.tcd.ie> To: Emiel Kollof <coolvibe@hackerheaven.org> Cc: John Baldwin <jhb@FreeBSD.org>, freebsd-current@FreeBSD.org Subject: Re: Netatalk broken in current? Lock order reversal? Message-ID: <200201160141.aa95174@salmon.maths.tcd.ie> In-Reply-To: Your message of "Wed, 16 Jan 2002 02:34:48 %2B0100." <20020116013448.GA584@laptop.hackerheaven.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <20020116013448.GA584@laptop.hackerheaven.org>, Emiel Kollof writes:
>
>Oh, on another note, is someone working at that netatalk breakage? Who
>do I have to discipline for that? :-)
Could you try the following patch in src/sys/netatalk? The problem
was caused by the -fno-common compiler option that was added to
the kernel build flags recently.
This compiles for me, but I haven't checked that it actually works.
Ian
Index: ddp_input.c
===================================================================
RCS file: /dump/FreeBSD-CVS/src/sys/netatalk/ddp_input.c,v
retrieving revision 1.12
diff -u -r1.12 ddp_input.c
--- ddp_input.c 13 Feb 2000 03:31:58 -0000 1.12
+++ ddp_input.c 16 Jan 2002 01:30:50 -0000
@@ -27,8 +27,6 @@
static struct ddpstat ddpstat;
static struct route forwro;
-const int atintrq1_present = 1, atintrq2_present = 1;
-
static void ddp_input(struct mbuf *, struct ifnet *, struct elaphdr *, int);
/*
Index: ddp_usrreq.c
===================================================================
RCS file: /dump/FreeBSD-CVS/src/sys/netatalk/ddp_usrreq.c,v
retrieving revision 1.22
diff -u -r1.22 ddp_usrreq.c
--- ddp_usrreq.c 17 Nov 2001 03:07:08 -0000 1.22
+++ ddp_usrreq.c 16 Jan 2002 01:32:34 -0000
@@ -14,6 +14,7 @@
#include <sys/protosw.h>
#include <net/if.h>
#include <net/route.h>
+#include <net/intrq.h>
#include <netatalk/at.h>
#include <netatalk/at_var.h>
@@ -547,6 +548,8 @@
{
atintrq1.ifq_maxlen = IFQ_MAXLEN;
atintrq2.ifq_maxlen = IFQ_MAXLEN;
+ atintrq1_present = 1;
+ atintrq2_present = 1;
mtx_init(&atintrq1.ifq_mtx, "at1_inq", MTX_DEF);
mtx_init(&atintrq2.ifq_mtx, "at2_inq", MTX_DEF);
}
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201160141.aa95174>