Source-Changes-HG archive

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

[src/trunk]: src/sys/netinet remove extra ifdefs. no functional changes.



details:   https://anonhg.NetBSD.org/src/rev/104a7aea5c00
branches:  trunk
changeset: 816813:104a7aea5c00
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Wed Jul 27 04:23:42 2016 +0000

description:
remove extra ifdefs. no functional changes.

ip_flow.c becomes build target only if GATEWAY kernel option is on.
So, "#ifdef GATEWAY" in ip_flow.c is not needed.

diffstat:

 sys/netinet/ip_flow.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 14576ad8df97 -r 104a7aea5c00 sys/netinet/ip_flow.c
--- a/sys/netinet/ip_flow.c     Wed Jul 27 02:33:40 2016 +0000
+++ b/sys/netinet/ip_flow.c     Wed Jul 27 04:23:42 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_flow.c,v 1.74 2016/07/26 05:53:30 ozaki-r Exp $     */
+/*     $NetBSD: ip_flow.c,v 1.75 2016/07/27 04:23:42 knakahara Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.74 2016/07/26 05:53:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.75 2016/07/27 04:23:42 knakahara Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -565,7 +565,6 @@
        return error;
 }
 
-#ifdef GATEWAY
 /*
  * sysctl helper routine for net.inet.ip.maxflows.
  */
@@ -625,7 +624,6 @@
 
        return error;
 }
-#endif /* GATEWAY */
 
 static void
 ipflow_sysctl_init(struct sysctllog **clog)
@@ -643,7 +641,6 @@
                       NULL, 0, NULL, 0,
                       CTL_NET, PF_INET, IPPROTO_IP, CTL_EOL);
 
-#ifdef GATEWAY
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
                       CTLTYPE_INT, "maxflows",
@@ -658,5 +655,4 @@
                        sysctl_net_inet_ip_hashsize, 0, &ip_hashsize, 0,
                        CTL_NET, PF_INET, IPPROTO_IP,
                        CTL_CREATE, CTL_EOL);
-#endif /* GATEWAY */
 }



Home | Main Index | Thread Index | Old Index