[src/trunk]: src/sys/netinet Remove ipflow_prune and replace with ipflow_reap...

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

details:   https://anonhg.NetBSD.org/src/rev/d8b11808e306
branches:  trunk
changeset: 794602:d8b11808e306
user:      liamjfoy <liamjfoy%NetBSD.org@localhost>
date:      Wed Mar 19 08:27:21 2014 +0000

description:
Remove ipflow_prune and replace with ipflow_reap. ok rmind@

diffstat:

 sys/netinet/ip_flow.c  |  11 ++---------
 sys/netinet/ip_input.c |   6 +++---
 sys/netinet/ip_var.h   |   4 ++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diffs (77 lines):

diff -r 12263591d108 -r d8b11808e306 sys/netinet/ip_flow.c
--- a/sys/netinet/ip_flow.c     Wed Mar 19 02:39:22 2014 +0000
+++ b/sys/netinet/ip_flow.c     Wed Mar 19 08:27:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_flow.c,v 1.60 2012/01/19 13:13:48 liamjfoy Exp $    */
+/*     $NetBSD: ip_flow.c,v 1.61 2014/03/19 08:27:21 liamjfoy 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.60 2012/01/19 13:13:48 liamjfoy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.61 2014/03/19 08:27:21 liamjfoy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -396,13 +396,6 @@
 }
 
 void
-ipflow_prune(void)
-{
-
-       (void) ipflow_reap(false);
-}
-
-void
 ipflow_slowtimo(void)
 {
        struct rtentry *rt;
diff -r 12263591d108 -r d8b11808e306 sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Wed Mar 19 02:39:22 2014 +0000
+++ b/sys/netinet/ip_input.c    Wed Mar 19 08:27:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_input.c,v 1.309 2014/02/25 18:30:12 pooka Exp $     */
+/*     $NetBSD: ip_input.c,v 1.310 2014/03/19 08:27:21 liamjfoy Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.309 2014/02/25 18:30:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.310 2014/03/19 08:27:21 liamjfoy Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -1525,7 +1525,7 @@
        mutex_enter(softnet_lock);
        KERNEL_LOCK(1, NULL);
 
-       ipflow_prune();
+       ipflow_reap(false);
 
        KERNEL_UNLOCK_ONE(NULL);
        mutex_exit(softnet_lock);
diff -r 12263591d108 -r d8b11808e306 sys/netinet/ip_var.h
--- a/sys/netinet/ip_var.h      Wed Mar 19 02:39:22 2014 +0000
+++ b/sys/netinet/ip_var.h      Wed Mar 19 08:27:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_var.h,v 1.97 2011/05/03 17:44:31 dyoung Exp $       */
+/*     $NetBSD: ip_var.h,v 1.98 2014/03/19 08:27:21 liamjfoy Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -222,7 +222,7 @@
            int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *);
 int    ipflow_init(int);
 void   ipflow_poolinit(void);
-void   ipflow_prune(void);
+void   ipflow_reap(bool);
 void   ipflow_create(const struct route *, struct mbuf *);
 void   ipflow_slowtimo(void);
 int    ipflow_invalidate_all(int);