Module Name: src
Committed By: pooka
Date: Wed May 27 17:41:03 UTC 2009
Modified Files:
src/sys/netinet: tcp_sack.c tcp_subr.c tcp_var.h
Log Message:
POOL_INIT -> pool_init
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.236 -r1.237 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.159 -r1.160 src/sys/netinet/tcp_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/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.24 src/sys/netinet/tcp_sack.c:1.25
--- src/sys/netinet/tcp_sack.c:1.24 Mon Apr 28 20:24:09 2008
+++ src/sys/netinet/tcp_sack.c Wed May 27 17:41:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.24 2008/04/28 20:24:09 martin Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.25 2009/05/27 17:41:03 pooka Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.24 2008/04/28 20:24:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.25 2009/05/27 17:41:03 pooka Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -163,8 +163,15 @@
#include <machine/stdarg.h>
/* SACK block pool. */
-static POOL_INIT(sackhole_pool, sizeof(struct sackhole), 0, 0, 0, "sackholepl",
- NULL, IPL_SOFTNET);
+static struct pool sackhole_pool;
+
+void
+tcp_sack_init()
+{
+
+ pool_init(&sackhole_pool, sizeof(struct sackhole), 0, 0, 0,
+ "sackholepl", NULL, IPL_SOFTNET);
+}
static struct sackhole *
sack_allochole(struct tcpcb *tp)
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.236 src/sys/netinet/tcp_subr.c:1.237
--- src/sys/netinet/tcp_subr.c:1.236 Wed Mar 18 16:00:22 2009
+++ src/sys/netinet/tcp_subr.c Wed May 27 17:41:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.236 2009/03/18 16:00:22 cegger Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.237 2009/05/27 17:41:03 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.236 2009/03/18 16:00:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.237 2009/05/27 17:41:03 pooka Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -410,6 +410,9 @@
/* Initialize reassembly queue */
tcpipqent_init();
+ /* SACK */
+ tcp_sack_init();
+
MOWNER_ATTACH(&tcp_tx_mowner);
MOWNER_ATTACH(&tcp_rx_mowner);
MOWNER_ATTACH(&tcp_reass_mowner);
Index: src/sys/netinet/tcp_var.h
diff -u src/sys/netinet/tcp_var.h:1.159 src/sys/netinet/tcp_var.h:1.160
--- src/sys/netinet/tcp_var.h:1.159 Thu Jan 29 20:38:22 2009
+++ src/sys/netinet/tcp_var.h Wed May 27 17:41:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_var.h,v 1.159 2009/01/29 20:38:22 pooka Exp $ */
+/* $NetBSD: tcp_var.h,v 1.160 2009/05/27 17:41:03 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -885,6 +885,7 @@
tcp_seq tcp_new_iss1(void *, void *, u_int16_t, u_int16_t, size_t,
tcp_seq);
+void tcp_sack_init(void);
void tcp_new_dsack(struct tcpcb *, tcp_seq, u_int32_t);
void tcp_sack_option(struct tcpcb *, const struct tcphdr *,
const u_char *, int);
