Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Jun 2004 12:44:01 -0800
From:      Beecher Rintoul <akbeech@northwindcom.dyndns.org>
To:        freebsd-current@freebsd.org
Cc:        Giorgos Keramidas <keramida@ceid.upatras.gr>
Subject:   Re: Panic on today's -current
Message-ID:  <200406241244.01721.akbeech@northwindcom.dyndns.org>
In-Reply-To: <20040624193220.GB878@gothmog.gr>
References:  <20040624142347.GD28051@afflictions.org> <XFMail.20040624142244.conrads@cox.net> <20040624193220.GB878@gothmog.gr>

index | next in thread | previous in thread | raw e-mail

On Thursday 24 June 2004 11:32 am, Giorgos Keramidas wrote:
> Index: sys/contrib/ipfilter/netinet/fil.c
> ===================================================================
> RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/fil.c,v
> retrieving revision 1.38
> diff -u -r1.38 fil.c
> --- sys/contrib/ipfilter/netinet/fil.c  21 Jun 2004 22:46:35
> -0000      1.38 +++ sys/contrib/ipfilter/netinet/fil.c  24 Jun 2004
> 19:17:33 -0000 @@ -2155,9 +2155,6 @@
>                 ip_natsync(ifp);
>                 ip_statesync(ifp);
>         }
> -#  if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043)
> -       IFNET_RUNLOCK();
> -#  endif
>         ip_natsync((struct ifnet *)-1);
>  #  if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043)
>         IFNET_RUNLOCK();

Getting the following trying to patch that file:

northwindcom# patch <kern_patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|RCS file: /usr/src/sys/contrib/ipfilter/netinet/fil.c,v
|retrieving revision 1.38
|diff -u -r1.38 fil.c
|--- /usr/src/sys/contrib/ipfilter/netinet/fil.c  21 Jun 2004 22:46:35 
-0000      1.38
|+++ /usr/src/sys/contrib/ipfilter/netinet/fil.c  24 Jun 2004 19:17:33 -0000
--------------------------
File to patch: /usr/src/sys/contrib/ipfilter/netinet/fil.c
Patching file /usr/src/sys/contrib/ipfilter/netinet/fil.c using Plan A...
patch: **** malformed patch at line 8:                 ip_natsync(ifp);



Beech

-- 
---------------------------------------------------------------------------------------
Beech Rintoul - System Administrator - akbeech@northwindcom.dyndns.org
/"\   ASCII Ribbon Campaign  | NorthWind Communications
\ / - NO HTML/RTF in e-mail  | 201 East 9th Avenue Ste.310
 X  - NO Word docs in e-mail | Anchorage, AK 99501
/ \ 
---------------------------------------------------------------------------------------












help

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406241244.01721.akbeech>