From owner-svn-src-stable-9@FreeBSD.ORG  Fri Feb  3 18:48:40 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A54221065676;
	Fri,  3 Feb 2012 18:48:40 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F1D78FC13;
	Fri,  3 Feb 2012 18:48:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q13ImegJ099559;
	Fri, 3 Feb 2012 18:48:40 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q13ImeTU099556;
	Fri, 3 Feb 2012 18:48:40 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201202031848.q13ImeTU099556@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 3 Feb 2012 18:48:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230953 - in stable/9/sys: net netinet
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Feb 2012 18:48:40 -0000

Author: ed
Date: Fri Feb  3 18:48:40 2012
New Revision: 230953
URL: http://svn.freebsd.org/changeset/base/230953

Log:
  MFC r226610:
  
    Add missing #includes.
  
    According to POSIX, these two header files should be able to be included
    by themselves, not depending on other headers. The <net/if.h> header
    uses struct sockaddr when __BSD_VISIBLE=1, while <netinet/tcp.h> uses
    integer datatypes (u_int32_t, u_short, etc).

Modified:
  stable/9/sys/net/if.h
  stable/9/sys/netinet/tcp.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/net/if.h
==============================================================================
--- stable/9/sys/net/if.h	Fri Feb  3 17:50:39 2012	(r230952)
+++ stable/9/sys/net/if.h	Fri Feb  3 18:48:40 2012	(r230953)
@@ -43,9 +43,11 @@
 /*
  * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
  * helps userland compatibility.  (struct timeval ifi_lastchange)
+ * The same holds for <sys/socket.h>.  (struct sockaddr ifru_addr)
  */
 #ifndef _KERNEL
 #include <sys/time.h>
+#include <sys/socket.h>
 #endif
 
 struct ifnet;

Modified: stable/9/sys/netinet/tcp.h
==============================================================================
--- stable/9/sys/netinet/tcp.h	Fri Feb  3 17:50:39 2012	(r230952)
+++ stable/9/sys/netinet/tcp.h	Fri Feb  3 18:48:40 2012	(r230953)
@@ -34,6 +34,7 @@
 #define _NETINET_TCP_H_
 
 #include <sys/cdefs.h>
+#include <sys/types.h>
 
 #if __BSD_VISIBLE