Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-4]: src/sys/netinet Pull up rev. 1.57, as was done on netbsd-1-...



details:   https://anonhg.NetBSD.org/src/rev/d7a7c8705b0b
branches:  netbsd-1-4
changeset: 470846:d7a7c8705b0b
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Aug 09 18:07:45 2000 +0000

description:
Pull up rev. 1.57, as was done on netbsd-1-5 branch, to
fix a compilation problem in userland.

diffstat:

 sys/netinet/ip_fil.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 0fb567204782 -r d7a7c8705b0b sys/netinet/ip_fil.c
--- a/sys/netinet/ip_fil.c      Fri Aug 04 15:21:50 2000 +0000
+++ b/sys/netinet/ip_fil.c      Wed Aug 09 18:07:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil.c,v 1.34.2.3 2000/08/02 15:44:46 he Exp $       */
+/*     $NetBSD: ip_fil.c,v 1.34.2.4 2000/08/09 18:07:45 thorpej Exp $  */
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: ip_fil.c,v 1.34.2.3 2000/08/02 15:44:46 he Exp $";
+static const char rcsid[] = "$NetBSD: ip_fil.c,v 1.34.2.4 2000/08/09 18:07:45 thorpej Exp $";
 #else
 static const char sccsid[] = "@(#)ip_fil.c     2.41 6/5/96 (C) 1993-1995 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil.c,v 2.4.2.14 1999/12/11 05:31:08 darrenr Exp";
@@ -436,8 +436,13 @@
                 * Since the default rule is to pass all packets,
                 * this shouldn't cause any noticeable side-effects.
                 */
-               if (fr_running == 0)
+               if (fr_running == 0) {
+#if defined(_KERNEL)
                        error = ipl_enable();
+#else
+                       error = EIO;
+#endif
+               }
                if (error == 0)
                        error = nat_ioctl(data, cmd, mode);
                SPL_X(s);



Home | Main Index | Thread Index | Old Index