CVS commit: src/sys/netinet

[Kengo NAKAHARA]

Module Name:    src
Committed By:   knakahara
Date:           Mon Jun 13 08:29:55 UTC 2016

Modified Files:
        src/sys/netinet: ip_flow.c ip_var.h

Log Message:
make ipflow_reap() static function.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.112 -r1.113 src/sys/netinet/ip_var.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet/ip_flow.c
diff -u src/sys/netinet/ip_flow.c:1.68 src/sys/netinet/ip_flow.c:1.69
--- src/sys/netinet/ip_flow.c:1.68	Mon Jun 13 08:04:44 2016
+++ src/sys/netinet/ip_flow.c	Mon Jun 13 08:29:55 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_flow.c,v 1.68 2016/06/13 08:04:44 knakahara Exp $	*/
+/*	$NetBSD: ip_flow.c,v 1.69 2016/06/13 08:29:55 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.68 2016/06/13 08:04:44 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.69 2016/06/13 08:29:55 knakahara Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -94,6 +94,7 @@ do { \
 static int ip_maxflows = IPFLOW_MAX;
 static int ip_hashsize = IPFLOW_DEFAULT_HASHSIZE;
 
+static struct ipflow *ipflow_reap(bool);
 static void ipflow_sysctl_init(struct sysctllog **);
 
 static size_t 
@@ -349,7 +350,7 @@ ipflow_free(struct ipflow *ipf)
 	pool_put(&ipflow_pool, ipf);
 }
 
-struct ipflow *
+static struct ipflow *
 ipflow_reap(bool just_one)
 {
 	while (just_one || ipflow_inuse > ip_maxflows) {

Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.112 src/sys/netinet/ip_var.h:1.113
--- src/sys/netinet/ip_var.h:1.112	Thu Apr 28 00:16:56 2016
+++ src/sys/netinet/ip_var.h	Mon Jun 13 08:29:55 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_var.h,v 1.112 2016/04/28 00:16:56 ozaki-r Exp $	*/
+/*	$NetBSD: ip_var.h,v 1.113 2016/06/13 08:29:55 knakahara Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -244,7 +244,6 @@ int	ip_if_output(struct ifnet * const, s
 /* IP Flow interface. */
 void	ipflow_init(void);
 void	ipflow_poolinit(void);
-struct ipflow *ipflow_reap(bool);
 void	ipflow_create(const struct route *, struct mbuf *);
 void	ipflow_slowtimo(void);
 int	ipflow_invalidate_all(int);