Module Name: src
Committed By: liamjfoy
Date: Wed Mar 19 08:27:21 UTC 2014
Modified Files:
src/sys/netinet: ip_flow.c ip_input.c ip_var.h
Log Message:
Remove ipflow_prune and replace with ipflow_reap. ok rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.309 -r1.310 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.97 -r1.98 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.60 src/sys/netinet/ip_flow.c:1.61
--- src/sys/netinet/ip_flow.c:1.60 Thu Jan 19 13:13:48 2012
+++ src/sys/netinet/ip_flow.c Wed Mar 19 08:27:21 2014
@@ -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 @@ ipflow_reap(bool just_one)
}
void
-ipflow_prune(void)
-{
-
- (void) ipflow_reap(false);
-}
-
-void
ipflow_slowtimo(void)
{
struct rtentry *rt;
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.309 src/sys/netinet/ip_input.c:1.310
--- src/sys/netinet/ip_input.c:1.309 Tue Feb 25 18:30:12 2014
+++ src/sys/netinet/ip_input.c Wed Mar 19 08:27:21 2014
@@ -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 @@ sysctl_net_inet_ip_maxflows(SYSCTLFN_ARG
mutex_enter(softnet_lock);
KERNEL_LOCK(1, NULL);
- ipflow_prune();
+ ipflow_reap(false);
KERNEL_UNLOCK_ONE(NULL);
mutex_exit(softnet_lock);
Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.97 src/sys/netinet/ip_var.h:1.98
--- src/sys/netinet/ip_var.h:1.97 Tue May 3 17:44:31 2011
+++ src/sys/netinet/ip_var.h Wed Mar 19 08:27:21 2014
@@ -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 rip_usrreq(struct socket *,
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);
