Date: Mon, 18 Oct 2010 22:23:21 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r214039 - in projects/ofed/head/sys/ofed/include: linux net Message-ID: <201010182223.o9IMNLYk087974@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010182223.o9IMNLYk087974>