From owner-freebsd-hackers Tue May 9 14:21:14 2000 Delivered-To: freebsd-hackers@freebsd.org Received: from ns1.cioe.com (ns1.cioe.com [204.120.165.37]) by hub.freebsd.org (Postfix) with ESMTP id 97D1B37C0C6 for ; Tue, 9 May 2000 14:21:07 -0700 (PDT) (envelope-from steve@virtual-voodoo.com) Received: from ny1wsh031 (blackhole.cioe.com [204.120.165.44]) by ns1.cioe.com (8.9.3/8.9.3) with SMTP id QAA69719; Tue, 9 May 2000 16:20:56 -0500 (EST) (envelope-from steve@virtual-voodoo.com) Message-ID: <00ae01bfb9fc$fbfaad70$851a050a@winstar.com> From: "Steven E. Ames" To: "Nick Hibma" Cc: "FreeBSD Hackers Mailing List" References: Subject: Re: in_cksum changes break IPSEC? Date: Tue, 9 May 2000 16:24:39 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.00.2919.6600 X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2919.6600 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG This (in the form of the commit that Paul Saab made a few hours after you sent this) fixed things up for me. Thanks everyone. -Steve ----- Original Message ----- From: "Nick Hibma" Sent: Tuesday, May 09, 2000 9:43 AM Subject: Re: in_cksum changes break IPSEC? > > The patch below should fix it for you. > > -- > n_hibma@webweaving.org > n_hibma@freebsd.org USB project > http://www.etla.net/~n_hibma/ > > ---------- Forwarded message ---------- > Date: Tue, 9 May 2000 12:49:16 +0100 (BST) > From: Nick Hibma > To: Jonathan Lemon > Cc: cvs-committers@freebsd.org > Subject: Re: cvs commit: src/sys/alpha/alpha in_cksum.c > src/sys/alpha/include in_cksum.h src/sys/i386/i386 in_cksum.c > src/sys/i386/include in_cksum.h > > > The following patch makes LINT compile again. Could you commit it if you > agree? Thanks. > > > su-2.03# cvs diff > Index: fil.c > =================================================================== > RCS file: /home/ncvs/src/sys/netinet/fil.c,v > retrieving revision 1.11 > diff -w -u -r1.11 fil.c > --- fil.c 2000/05/01 20:13:50 1.11 > +++ fil.c 2000/05/09 11:49:10 > @@ -87,6 +87,8 @@ > #endif > #include "netinet/ipl.h" > > +#include "machine/in_cksum.h" > + > #ifndef _KERNEL > # include "ipf.h" > # include "ipt.h" > Index: ip_fil.c > =================================================================== > RCS file: /home/ncvs/src/sys/netinet/ip_fil.c,v > retrieving revision 1.14 > diff -w -u -r1.14 ip_fil.c > --- ip_fil.c 2000/02/10 21:29:09 1.14 > +++ ip_fil.c 2000/05/09 11:49:33 > @@ -114,6 +114,8 @@ > extern int ip_optcopy __P((struct ip *, struct ip *)); > #endif > > +#include "machine/in_cksum.h" > + > > extern struct protosw inetsw[]; > > > > > On Sat, 6 May 2000, Jonathan Lemon wrote: > > > jlemon 2000/05/06 11:18:33 PDT > > > > Modified files: > > sys/alpha/alpha in_cksum.c > > sys/alpha/include in_cksum.h > > sys/i386/i386 in_cksum.c > > sys/i386/include in_cksum.h > > Log: > > Make in_cksum() a macro call to in_cksum_skip(), since it provides the > > same functionality. Sharing code should help cache issues. > > > > Remove in_cksum_partial, since its not being used, and we now have > > a way to compute partial checksums on mbuf chains. > > > > Revision Changes Path > > 1.4 +1 -33 src/sys/alpha/alpha/in_cksum.c > > 1.5 +3 -4 src/sys/alpha/include/in_cksum.h > > 1.20 +1 -344 src/sys/i386/i386/in_cksum.c > > 1.9 +3 -4 src/sys/i386/include/in_cksum.h > > > > > > -- > n_hibma@webweaving.org > n_hibma@freebsd.org USB project > http://www.etla.net/~n_hibma/ > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message