[src/netbsd-1-4]: src/sys/netinet Pull up revision 1.30 (via patch, requested...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90ceb12025c0
branches:  netbsd-1-4
changeset: 471290:90ceb12025c0
user:      he <he%NetBSD.org@localhost>
date:      Sat Apr 14 21:15:30 2001 +0000

description:
Pull up revision 1.30 (via patch, requested by darrenr):
  Fix bug related to fragment cache handling.

diffstat:

 sys/netinet/ip_state.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 97379832c545 -r 90ceb12025c0 sys/netinet/ip_state.c
--- a/sys/netinet/ip_state.c    Sat Apr 14 21:15:14 2001 +0000
+++ b/sys/netinet/ip_state.c    Sat Apr 14 21:15:30 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_state.c,v 1.17.2.3 2000/05/25 23:03:43 he Exp $     */
+/*     $NetBSD: ip_state.c,v 1.17.2.4 2001/04/14 21:15:30 he Exp $     */
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: ip_state.c,v 1.17.2.3 2000/05/25 23:03:43 he Exp $";
+static const char rcsid[] = "$NetBSD: ip_state.c,v 1.17.2.4 2001/04/14 21:15:30 he Exp $";
 #else
 static const char sccsid[] = "@(#)ip_state.c   1.8 6/5/96 (C) 1993-1995 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_state.c,v 2.3.2.14 1999/11/30 13:46:05 darrenr Exp";
@@ -425,7 +425,7 @@
 #endif
        RWLOCK_EXIT(&ipf_state);
        fin->fin_rev = (is->is_dst.s_addr != ip->ip_dst.s_addr);
-       if (fin->fin_fi.fi_fl & FI_FRAG)
+       if ((fin->fin_fi.fi_fl & FI_FRAG) && (pass & FR_KEEPFRAG))
                ipfr_newfrag(ip, fin, pass ^ FR_KEEPSTATE);
        return is;
 }
@@ -967,7 +967,7 @@
        fin->fin_fr = fr;
        pass = is->is_pass;
        RWLOCK_EXIT(&ipf_state);
-       if (fin->fin_fi.fi_fl & FI_FRAG)
+       if ((fin->fin_fi.fi_fl & FI_FRAG) && (pass & FR_KEEPFRAG))
                ipfr_newfrag(ip, fin, pass ^ FR_KEEPSTATE);
        return fr;
 }