aboutsummaryrefslogtreecommitdiffstats
path: root/src/include/ipxe/ip6.h
diff options
context:
space:
mode:
authorPiotr Jaroszyński <p.jaroszynski@gmail.com>2010-08-19 23:39:17 +0200
committerMichael Brown <mcb30@ipxe.org>2010-08-20 10:13:04 +0100
commitb9eaf24df211591793bfe151169a23ab1567bdf9 (patch)
tree0d08906e0754715c4eaeb1322459baecb050eeeb /src/include/ipxe/ip6.h
parent49d6f5700561be091b2b25bb7641708333e4911d (diff)
downloadipxe-b9eaf24df211591793bfe151169a23ab1567bdf9.tar.gz
[build] Fix misaligned table entries when using gcc 4.5
Declarations without the accompanying __table_entry cause misalignment of the table entries when using gcc 4.5. Fix by adding the appropriate __table_entry macro or (where possible) by removing unnecessary forward declarations. Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe/ip6.h')
-rw-r--r--src/include/ipxe/ip6.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/ipxe/ip6.h b/src/include/ipxe/ip6.h
index 70c2fad23..e9584bd6f 100644
--- a/src/include/ipxe/ip6.h
+++ b/src/include/ipxe/ip6.h
@@ -11,6 +11,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
#include <ipxe/in.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/tcpip.h>
/* IP6 constants */
@@ -64,11 +66,9 @@ struct ipv6_pseudo_header {
#define IP6_NO_HEADER 0x59
struct io_buffer;
-struct net_device;
-struct net_protocol;
-extern struct net_protocol ipv6_protocol;
-extern struct tcpip_net_protocol ipv6_tcpip_protocol;
+extern struct net_protocol ipv6_protocol __net_protocol;
+extern struct tcpip_net_protocol ipv6_tcpip_protocol __tcpip_net_protocol;
extern char * inet6_ntoa ( struct in6_addr in6 );
extern int add_ipv6_address ( struct net_device *netdev,