From owner-svn-src-projects@FreeBSD.ORG  Mon Oct 18 22:23:21 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 822F0106564A;
	Mon, 18 Oct 2010 22:23:21 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 561428FC13;
	Mon, 18 Oct 2010 22:23:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9IMNLAr087979;
	Mon, 18 Oct 2010 22:23:21 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9IMNLYk087974;
	Mon, 18 Oct 2010 22:23:21 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201010182223.o9IMNLYk087974@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Mon, 18 Oct 2010 22:23:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214039 - in projects/ofed/head/sys/ofed/include: linux
	net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Oct 2010 22:23:21 -0000

Author: jeff
Date: Mon Oct 18 22:23:21 2010
New Revision: 214039
URL: http://svn.freebsd.org/changeset/base/214039

Log:
   - Improve ipv6 support by bringing in opt_inet6.h and including the right
     headers where appropriate.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/in6.h
  projects/ofed/head/sys/ofed/include/linux/list.h
  projects/ofed/head/sys/ofed/include/linux/netdevice.h
  projects/ofed/head/sys/ofed/include/net/ipv6.h

Modified: projects/ofed/head/sys/ofed/include/linux/in6.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/in6.h	Mon Oct 18 22:22:38 2010	(r214038)
+++ projects/ofed/head/sys/ofed/include/linux/in6.h	Mon Oct 18 22:23:21 2010	(r214039)
@@ -29,4 +29,6 @@
 #ifndef	_LINUX_IN6_H_
 #define	_LINUX_IN6_H_
 
+#include "opt_inet6.h"
+
 #endif	/* _LINUX_IN6_H_ */

Modified: projects/ofed/head/sys/ofed/include/linux/list.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/list.h	Mon Oct 18 22:22:38 2010	(r214038)
+++ projects/ofed/head/sys/ofed/include/linux/list.h	Mon Oct 18 22:23:21 2010	(r214039)
@@ -45,11 +45,18 @@
 #include <sys/conf.h>
 #include <sys/socket.h>
 
+#include <net/if.h>
 #include <net/if_types.h>
 
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
 
+#include "opt_inet6.h"
+#ifdef INET6
+#include <netinet6/in6_var.h>
+#include <netinet6/nd6.h>
+#endif
+
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 

Modified: projects/ofed/head/sys/ofed/include/linux/netdevice.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/netdevice.h	Mon Oct 18 22:22:38 2010	(r214038)
+++ projects/ofed/head/sys/ofed/include/linux/netdevice.h	Mon Oct 18 22:23:21 2010	(r214039)
@@ -49,7 +49,7 @@ struct net {
 
 extern struct net init_net;
 
-#define	MAX_ADDR_LEN		32 
+#define	MAX_ADDR_LEN		20
 
 #define	net_device	ifnet
 

Modified: projects/ofed/head/sys/ofed/include/net/ipv6.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/net/ipv6.h	Mon Oct 18 22:22:38 2010	(r214038)
+++ projects/ofed/head/sys/ofed/include/net/ipv6.h	Mon Oct 18 22:23:21 2010	(r214039)
@@ -29,10 +29,13 @@
 #ifndef _LINUX_NET_IPV6_H_
 #define	_LINUX_NET_IPV6_H_
 
+#include "opt_inet6.h"
+
 #define	ipv6_addr_loopback IN6_IS_ADDR_LOOPBACK
 #define	ipv6_addr_copy(dst, src)					\
 	memcpy((dst), (src), sizeof(struct in6_addr))
 
+#ifdef INET6
 static inline void
 ipv6_ib_mc_map(const struct in6_addr *addr, const unsigned char *broadcast,
     char *buf)
@@ -52,5 +55,6 @@ ipv6_ib_mc_map(const struct in6_addr *ad
 	buf[9]  = broadcast[9];
 	memcpy(&buf[10], &addr->s6_addr[6], 10);
 }
+#endif
 
 #endif	/* _LINUX_NET_IPV6_H_ */