aboutsummaryrefslogtreecommitdiff
path: root/sys/ofed/include
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2012-04-12 14:01:06 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2012-04-12 14:01:06 +0000
commited5a2b61fd7d3b4fa10f8eb6c8cbe710f4a94c81 (patch)
treeac89bf8fd09d6daaaaaa0332d7d9f9daa8d1054f /sys/ofed/include
parent6937a7ac6bc401550dc6c276eae8f78801e87a92 (diff)
Notes
Diffstat (limited to 'sys/ofed/include')
-rw-r--r--sys/ofed/include/linux/in.h2
-rw-r--r--sys/ofed/include/linux/in6.h2
-rw-r--r--sys/ofed/include/net/ip.h4
-rw-r--r--sys/ofed/include/net/ipv6.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/sys/ofed/include/linux/in.h b/sys/ofed/include/linux/in.h
index 8fa3dc2a2bc2..803ef2b02880 100644
--- a/sys/ofed/include/linux/in.h
+++ b/sys/ofed/include/linux/in.h
@@ -28,6 +28,8 @@
#ifndef _LINUX_IN_H_
#define _LINUX_IN_H_
+#include "opt_inet.h"
+
#include <netinet/in.h>
#include <asm/byteorder.h>
diff --git a/sys/ofed/include/linux/in6.h b/sys/ofed/include/linux/in6.h
index 2032b6179594..925c7ed3a386 100644
--- a/sys/ofed/include/linux/in6.h
+++ b/sys/ofed/include/linux/in6.h
@@ -29,8 +29,6 @@
#ifndef _LINUX_IN6_H_
#define _LINUX_IN6_H_
-#ifndef KLD_MODULE
#include "opt_inet6.h"
-#endif
#endif /* _LINUX_IN6_H_ */
diff --git a/sys/ofed/include/net/ip.h b/sys/ofed/include/net/ip.h
index 8b29d62796cb..d9d64d539f6d 100644
--- a/sys/ofed/include/net/ip.h
+++ b/sys/ofed/include/net/ip.h
@@ -29,6 +29,8 @@
#ifndef _LINUX_NET_IP_H_
#define _LINUX_NET_IP_H_
+#include "opt_inet.h"
+
#include <sys/types.h>
#include <sys/socket.h>
@@ -39,6 +41,7 @@
#include <netinet/in.h>
#include <netinet/in_pcb.h>
+#ifdef INET
static inline void inet_get_local_port_range(int *low, int *high)
{
*low = V_ipport_firstauto;
@@ -73,5 +76,6 @@ ip_ib_mc_map(uint32_t addr, const unsigned char *bcast, char *buf)
buf[18] = (addr >> 8) & 0xff;
buf[19] = addr & 0xff;
}
+#endif
#endif /* _LINUX_NET_IP_H_ */
diff --git a/sys/ofed/include/net/ipv6.h b/sys/ofed/include/net/ipv6.h
index 6f02555e9bad..74bbe778ac67 100644
--- a/sys/ofed/include/net/ipv6.h
+++ b/sys/ofed/include/net/ipv6.h
@@ -29,9 +29,7 @@
#ifndef _LINUX_NET_IPV6_H_
#define _LINUX_NET_IPV6_H_
-#ifndef KLD_MODULE
#include "opt_inet6.h"
-#endif
#define ipv6_addr_loopback IN6_IS_ADDR_LOOPBACK
#define ipv6_addr_copy(dst, src) \