Source-Changes-HG archive

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

[src/netbsd-1-5]: src/sys/netinet Pull up rev. 1.57, to fix userland compilat...



details:   https://anonhg.NetBSD.org/src/rev/fedd60c7d7af
branches:  netbsd-1-5
changeset: 488964:fedd60c7d7af
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Aug 07 15:40:23 2000 +0000

description:
Pull up rev. 1.57, to fix userland compilation problem,
as noted by Matthias Drochner.

diffstat:

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

diffs (33 lines):

diff -r b1065b670c82 -r fedd60c7d7af sys/netinet/ip_fil.c
--- a/sys/netinet/ip_fil.c      Mon Aug 07 14:26:06 2000 +0000
+++ b/sys/netinet/ip_fil.c      Mon Aug 07 15:40:23 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil.c,v 1.55.2.1 2000/08/06 17:03:23 thorpej Exp $  */
+/*     $NetBSD: ip_fil.c,v 1.55.2.2 2000/08/07 15:40:23 thorpej Exp $  */
 
 /*
  * Copyright (C) 1993-2000 by Darren Reed.
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: ip_fil.c,v 1.55.2.1 2000/08/06 17:03:23 thorpej Exp $";
+static const char rcsid[] = "$NetBSD: ip_fil.c,v 1.55.2.2 2000/08/07 15:40:23 thorpej Exp $";
 #else
 static const char sccsid[] = "@(#)ip_fil.c     2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil.c,v 2.42.2.10 2000/05/25 20:16:44 darrenr Exp";
@@ -497,8 +497,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