Patch to fix buildkernel (sys/net/if_arcsubr.c arpresolve() call)
David Wolfskill
david at catwhisker.org
Sun Apr 4 18:46:04 PDT 2004
Symptom (which the tinderbox also shows) is:
===> arcnet
cc -O -pipe -D_KERNEL -DKLD_MODULE -nostdinc -I- -include /common/S3/obj/usr/src/sys/LAPTOP_30W/opt_global.h -I. -I@ -I@/../include -finline-limit=8000 -fno-common -g -I/common/S3/obj/usr/src/sys/LAPTOP_30W -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions -std=c99 -c /usr/src/sys/net/if_arcsubr.c
/usr/src/sys/net/if_arcsubr.c: In function `arc_output':
/usr/src/sys/net/if_arcsubr.c:139: error: too many arguments to function `arpresolve'
*** Error code 1
Stop in /usr/src/sys/modules/arcnet.
*** Error code 1
Stop in /usr/src/sys/modules.
*** Error code 1
Stop in /common/S3/obj/usr/src/sys/LAPTOP_30W.
*** Error code 1
Stop in /usr/src.
*** Error code 1
Stop in /usr/src.
After reading Luigi's comments to the effect that the 4th parameter
to arpresolve() was unused, and considering that I don't use ARCnet (so
the below patch is not tested), I did:
Index: sys/net/if_arcsubr.c
===================================================================
RCS file: /cvs/freebsd/src/sys/net/if_arcsubr.c,v
retrieving revision 1.18
diff -u -r1.18 if_arcsubr.c
--- sys/net/if_arcsubr.c 22 Mar 2004 03:52:51 -0000 1.18
+++ sys/net/if_arcsubr.c 5 Apr 2004 01:03:09 -0000
@@ -136,7 +136,7 @@
adst = arcbroadcastaddr; /* ARCnet broadcast address */
else if (ifp->if_flags & IFF_NOARP)
adst = ntohl(SIN(dst)->sin_addr.s_addr) & 0xFF;
- else if (!arpresolve(ifp, rt, m, dst, &adst, rt0))
+ else if (!arpresolve(ifp, rt, m, dst, &adst))
return 0; /* not resolved yet */
atype = (ifp->if_flags & IFF_LINK0) ?
which gets through the build OK:
freebeast(5.2-C)[1] uname -a
FreeBSD freebeast.catwhisker.org 5.2-CURRENT FreeBSD 5.2-CURRENT #148: Sun Apr 4 10:24:31 PDT 2004 root@:/common/S4/obj/usr/src/sys/FREEBEAST i386
freebeast(5.2-C)[2]
[Sorry about the delay in generating/posting the patch; I've been
behind in email for the last few days.]
Peace,
david
--
David H. Wolfskill david at catwhisker.org
I do not "unsubscribe" from email "services" to which I have not explicitly
subscribed. Rather, I block spammers' access to SMTP servers I control,
and encourage others who are in a position to do so to do likewise.
More information about the freebsd-current
mailing list