Module Name: src
Committed By: maxv
Date: Mon Nov 10 18:52:51 UTC 2014
Modified Files:
src/sys/netinet: if_atm.c in_pcb.c raw_ip.c tcp_output.c tcp_sack.c
tcp_subr.c tcp_timer.c tcp_usrreq.c tcp_vtw.c
Log Message:
Do not uselessly include <sys/malloc.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.152 -r1.153 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.145 -r1.146 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.178 -r1.179 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.29 -r1.30 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.256 -r1.257 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.87 -r1.88 src/sys/netinet/tcp_timer.c
cvs rdiff -u -r1.201 -r1.202 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/tcp_vtw.c
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/if_atm.c
diff -u src/sys/netinet/if_atm.c:1.33 src/sys/netinet/if_atm.c:1.34
--- src/sys/netinet/if_atm.c:1.33 Mon Sep 24 03:05:53 2012
+++ src/sys/netinet/if_atm.c Mon Nov 10 18:52:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.c,v 1.33 2012/09/24 03:05:53 msaitoh Exp $ */
+/* $NetBSD: if_atm.c,v 1.34 2014/11/10 18:52:51 maxv Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.33 2012/09/24 03:05:53 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.34 2014/11/10 18:52:51 maxv Exp $");
#include "opt_inet.h"
#include "opt_natm.h"
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/time.h>
Index: src/sys/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.152 src/sys/netinet/in_pcb.c:1.153
--- src/sys/netinet/in_pcb.c:1.152 Sun Sep 7 00:50:56 2014
+++ src/sys/netinet/in_pcb.c Mon Nov 10 18:52:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.c,v 1.152 2014/09/07 00:50:56 rmind Exp $ */
+/* $NetBSD: in_pcb.c,v 1.153 2014/11/10 18:52:51 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,14 +93,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.152 2014/09/07 00:50:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.153 2014/11/10 18:52:51 maxv Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.145 src/sys/netinet/raw_ip.c:1.146
--- src/sys/netinet/raw_ip.c:1.145 Sat Aug 9 05:33:01 2014
+++ src/sys/netinet/raw_ip.c Mon Nov 10 18:52:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.145 2014/08/09 05:33:01 rtr Exp $ */
+/* $NetBSD: raw_ip.c,v 1.146 2014/11/10 18:52:51 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.145 2014/08/09 05:33:01 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.146 2014/11/10 18:52:51 maxv Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1
#include <sys/param.h>
#include <sys/sysctl.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/protosw.h>
Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.178 src/sys/netinet/tcp_output.c:1.179
--- src/sys/netinet/tcp_output.c:1.178 Sat Oct 25 15:07:13 2014
+++ src/sys/netinet/tcp_output.c Mon Nov 10 18:52:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.178 2014/10/25 15:07:13 christos Exp $ */
+/* $NetBSD: tcp_output.c,v 1.179 2014/11/10 18:52:51 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.178 2014/10/25 15:07:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.179 2014/11/10 18:52:51 maxv Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -143,7 +143,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_output.c
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/netinet/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.29 src/sys/netinet/tcp_sack.c:1.30
--- src/sys/netinet/tcp_sack.c:1.29 Tue Nov 12 09:02:05 2013
+++ src/sys/netinet/tcp_sack.c Mon Nov 10 18:52:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.29 2013/11/12 09:02:05 kefren Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.30 2014/11/10 18:52:51 maxv 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.29 2013/11/12 09:02:05 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.30 2014/11/10 18:52:51 maxv Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -112,7 +112,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.256 src/sys/netinet/tcp_subr.c:1.257
--- src/sys/netinet/tcp_subr.c:1.256 Fri Sep 5 06:04:43 2014
+++ src/sys/netinet/tcp_subr.c Mon Nov 10 18:52:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.256 2014/09/05 06:04:43 matt Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.257 2014/11/10 18:52:51 maxv 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.256 2014/09/05 06:04:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.257 2014/11/10 18:52:51 maxv Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -103,7 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v
#include <sys/atomic.h>
#include <sys/proc.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/once.h>
#include <sys/socket.h>
Index: src/sys/netinet/tcp_timer.c
diff -u src/sys/netinet/tcp_timer.c:1.87 src/sys/netinet/tcp_timer.c:1.88
--- src/sys/netinet/tcp_timer.c:1.87 Thu Jan 2 18:29:01 2014
+++ src/sys/netinet/tcp_timer.c Mon Nov 10 18:52:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_timer.c,v 1.87 2014/01/02 18:29:01 pooka Exp $ */
+/* $NetBSD: tcp_timer.c,v 1.88 2014/11/10 18:52:51 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,14 +93,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.87 2014/01/02 18:29:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.88 2014/11/10 18:52:51 maxv Exp $");
#include "opt_inet.h"
#include "opt_tcp_debug.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.201 src/sys/netinet/tcp_usrreq.c:1.202
--- src/sys/netinet/tcp_usrreq.c:1.201 Sat Oct 18 08:33:29 2014
+++ src/sys/netinet/tcp_usrreq.c Mon Nov 10 18:52:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.201 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.202 2014/11/10 18:52:51 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.201 2014/10/18 08:33:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.202 2014/11/10 18:52:51 maxv Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -109,7 +109,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.11 src/sys/netinet/tcp_vtw.c:1.12
--- src/sys/netinet/tcp_vtw.c:1.11 Fri Sep 5 06:03:51 2014
+++ src/sys/netinet/tcp_vtw.c Mon Nov 10 18:52:51 2014
@@ -84,7 +84,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/kmem.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
@@ -124,7 +123,7 @@
#include <netinet/tcp_vtw.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.11 2014/09/05 06:03:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.12 2014/11/10 18:52:51 maxv Exp $");
#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
