diff options
author | Piotr Jaroszyński <p.jaroszynski@gmail.com> | 2010-08-19 23:39:17 +0200 |
---|---|---|
committer | Michael Brown <mcb30@ipxe.org> | 2010-08-20 10:13:04 +0100 |
commit | b9eaf24df211591793bfe151169a23ab1567bdf9 (patch) | |
tree | 0d08906e0754715c4eaeb1322459baecb050eeeb /src/include/ipxe/arp.h | |
parent | 49d6f5700561be091b2b25bb7641708333e4911d (diff) | |
download | ipxe-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/arp.h')
-rw-r--r-- | src/include/ipxe/arp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/include/ipxe/arp.h b/src/include/ipxe/arp.h index 373a95da1..f7b99c68d 100644 --- a/src/include/ipxe/arp.h +++ b/src/include/ipxe/arp.h @@ -10,9 +10,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/tables.h> - -struct net_device; -struct net_protocol; +#include <ipxe/netdevice.h> /** A network-layer protocol that relies upon ARP */ struct arp_net_protocol { @@ -35,7 +33,7 @@ struct arp_net_protocol { /** Declare an ARP protocol */ #define __arp_net_protocol __table_entry ( ARP_NET_PROTOCOLS, 01 ) -extern struct net_protocol arp_protocol; +extern struct net_protocol arp_protocol __net_protocol; extern int arp_resolve ( struct net_device *netdev, struct net_protocol *net_protocol, |