PERFORCE change 147863 for review
Julian Elischer
julian at FreeBSD.org
Wed Aug 20 01:56:01 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=147863
Change 147863 by julian at julian_trafmon1 on 2008/08/20 01:55:43
loop back changes to format
Affected files ...
.. //depot/projects/vimage-commit/src/sys/net/if.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/sys/sysctl.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/vm/vm_meter.c#6 integrate
Differences ...
==== //depot/projects/vimage-commit/src/sys/net/if.c#8 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)if.c 8.5 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/net/if.c,v 1.282 2008/08/17 23:27:27 bz Exp $
+ * $FreeBSD: src/sys/net/if.c,v 1.283 2008/08/20 01:05:56 julian Exp $
*/
#include "opt_compat.h"
==== //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#8 (text+ko) ====
@@ -38,7 +38,7 @@
* Authors: Julian Elischer <julian at freebsd.org>
* Archie Cobbs <archie at freebsd.org>
*
- * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.161 2008/08/17 23:27:27 bz Exp $
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.162 2008/08/20 01:05:56 julian Exp $
* $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
*/
==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#8 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.188 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.189 2008/08/20 01:05:56 julian Exp $");
#define DEB(x)
#define DDB(x) x
@@ -4509,7 +4509,7 @@
}
done:
callout_reset(&V_ipfw_timeout, V_dyn_keepalive_period * hz,
- ipfw_tick, NULL);
+ ipfw_tick, NULL);
}
int
==== //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#7 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.339 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.341 2008/08/20 01:24:55 julian Exp $");
#include "opt_bootp.h"
#include "opt_ipfw.h"
==== //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#6 (text+ko) ====
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_mroute.c,v 1.140 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_mroute.c,v 1.141 2008/08/20 01:05:56 julian Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
==== //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#9 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.192 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.193 2008/08/20 01:05:56 julian Exp $");
#include "opt_inet6.h"
#include "opt_ipsec.h"
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#7 (text+ko) ====
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.18 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.20 2008/08/20 01:24:55 julian Exp $");
#include "opt_inet6.h"
@@ -252,16 +252,16 @@
* Allocate the hostcache entries.
*/
V_tcp_hostcache.zone =
- uma_zcreate("hostcache", sizeof(struct hc_metrics),
- NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
+ uma_zcreate("hostcache", sizeof(struct hc_metrics),
+ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
uma_zone_set_max(V_tcp_hostcache.zone, V_tcp_hostcache.cache_limit);
/*
* Set up periodic cache cleanup.
*/
callout_init(&V_tcp_hc_callout, CALLOUT_MPSAFE);
- callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz, tcp_hc_purge, 0);
callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz,
+ tcp_hc_purge, curvnet);
tcp_hc_purge, 0);
}
@@ -683,8 +683,7 @@
for (i = 0; i < V_tcp_hostcache.hashsize; i++) {
THC_LOCK(&V_tcp_hostcache.hashbase[i].hch_mtx);
TAILQ_FOREACH_SAFE(hc_entry,
- &V_tcp_hostcache.hashbase[i].hch_bucket,
- rmx_q, hc_next) {
+ &V_tcp_hostcache.hashbase[i].hch_bucket, rmx_q, hc_next) {
if (all || hc_entry->rmx_expire <= 0) {
TAILQ_REMOVE(&V_tcp_hostcache.hashbase[i].hch_bucket,
hc_entry, rmx_q);
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#9 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.378 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.379 2008/08/20 01:05:56 julian Exp $");
#include "opt_ipfw.h" /* for ipfw_fwd */
#include "opt_inet.h"
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#8 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.309 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.311 2008/08/20 01:24:55 julian Exp $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -955,7 +955,7 @@
INP_INFO_RLOCK(&V_tcbinfo);
for (inp = LIST_FIRST(V_tcbinfo.ipi_listhead), i = 0;
- inp != NULL && i < n; inp = LIST_NEXT(inp, inp_list)) {
+ inp != NULL && i < n; inp = LIST_NEXT(inp, inp_list)) {
INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt) {
/*
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#12 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.151 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.152 2008/08/20 01:05:56 julian Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
==== //depot/projects/vimage-commit/src/sys/netinet6/in6.c#7 (text+ko) ====
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/in6.c,v 1.81 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/in6.c,v 1.83 2008/08/20 01:24:55 julian Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -2164,7 +2164,7 @@
IFNET_RLOCK();
for (ifp = TAILQ_FIRST(&V_ifnet); ifp;
- ifp = TAILQ_NEXT(ifp, if_list)) {
+ ifp = TAILQ_NEXT(ifp, if_list)) {
/* this function can be called during ifnet initialization */
if (!ifp->if_afdata[AF_INET6])
continue;
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#6 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/in6_gif.c,v 1.31 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/in6_gif.c,v 1.32 2008/08/20 01:05:56 julian Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#8 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.44 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.46 2008/08/20 01:24:55 julian Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -888,7 +888,7 @@
bzero(nullbuf, sizeof(nullbuf));
for (ifp = TAILQ_FIRST(&V_ifnet); ifp;
- ifp = TAILQ_NEXT(ifp, if_list)) {
+ ifp = TAILQ_NEXT(ifp, if_list)) {
ndi = ND_IFINFO(ifp);
if (bcmp(ndi->randomid, nullbuf, sizeof(nullbuf)) != 0) {
/*
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#7 (text+ko) ====
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.94 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.95 2008/08/20 01:05:56 julian Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
==== //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#7 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/nd6.c,v 1.89 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/nd6.c,v 1.91 2008/08/20 01:24:55 julian Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -146,6 +146,7 @@
callout_reset(&V_nd6_slowtimo_ch, ND6_SLOWTIMER_INTERVAL * hz,
nd6_slowtimo, NULL);
+
nd6_init_done = 1;
}
@@ -1914,7 +1915,7 @@
nd6_slowtimo, arg);
IFNET_RLOCK();
for (ifp = TAILQ_FIRST(&V_ifnet); ifp;
- ifp = TAILQ_NEXT(ifp, if_list)) {
+ ifp = TAILQ_NEXT(ifp, if_list)) {
nd6if = ND_IFINFO(ifp);
if (nd6if->basereachable && /* already initialized */
(nd6if->recalctm -= ND6_SLOWTIMER_INTERVAL) <= 0) {
==== //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#6 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/nd6_rtr.c,v 1.40 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/nd6_rtr.c,v 1.42 2008/08/20 01:24:55 julian Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -855,7 +855,7 @@
struct nd_prefix *search;
for (search = V_nd_prefix.lh_first;
- search; search = search->ndpr_next) {
+ search; search = search->ndpr_next) {
if (key->ndpr_ifp == search->ndpr_ifp &&
key->ndpr_plen == search->ndpr_plen &&
in6_are_prefix_equal(&key->ndpr_prefix.sin6_addr,
==== //depot/projects/vimage-commit/src/sys/sys/sysctl.h#4 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)sysctl.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/sys/sys/sysctl.h,v 1.158 2008/07/21 15:05:25 pjd Exp $
+ * $FreeBSD: src/sys/sys/sysctl.h,v 1.160 2008/08/20 01:24:55 julian Exp $
*/
#ifndef _SYS_SYSCTL_H_
@@ -246,8 +246,7 @@
#define SYSCTL_NODE(parent, nbr, name, access, handler, descr) \
struct sysctl_oid_list SYSCTL_NODE_CHILDREN(parent, name); \
SYSCTL_OID(parent, nbr, name, CTLTYPE_NODE|(access), \
- (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, \
- "N", descr)
+ (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, "N", descr)
#define SYSCTL_ADD_NODE(ctx, parent, nbr, name, access, handler, descr) \
sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_NODE|(access), \
==== //depot/projects/vimage-commit/src/sys/vm/vm_meter.c#6 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.98 2008/03/19 06:19:01 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.99 2008/08/20 01:05:56 julian Exp $");
#include <sys/param.h>
More information about the p4-projects
mailing list