gcc3 compatibility: removed ARP_NET_PROTOCOL().

diff --git a/src/include/gpxe/arp.h b/src/include/gpxe/arp.h
index ffaf418a12a5c79a3d0c6eff62dd2a2d6c57f95f..8ff1cff0266a6c8b8ecce51f2883c567d708e720 100644 (file)
--- a/src/include/gpxe/arp.h
+++ b/src/include/gpxe/arp.h
@@ -26,13 +26,8 @@ struct arp_net_protocol {
                          const void *net_addr );
 };
 
-/**
- * Register an ARP protocol
- *
- * @v protocol         ARP protocol
- */
-#define ARP_NET_PROTOCOL( protocol ) \
-       struct arp_net_protocol protocol __table ( arp_net_protocols, 01 )
+/** Declare an ARP protocol */
+#define __arp_net_protocol __table ( arp_net_protocols, 01 )
 
 extern int arp_resolve ( struct net_device *netdev,
                         struct net_protocol *net_protocol,

diff --git a/src/net/ipv4.c b/src/net/ipv4.c
index bfef358dff99a884aba25f82baf6a54b4a4ea99c..4c07c2c911ad15f4d33cb80018aaf7a3c1812d98 100644 (file)
--- a/src/net/ipv4.c
+++ b/src/net/ipv4.c
@@ -530,9 +530,7 @@ struct tcpip_net_protocol ipv4_tcpip_protocol = {
 TCPIP_NET_PROTOCOL ( ipv4_tcpip_protocol );
 
 /** IPv4 ARP protocol */
-struct arp_net_protocol ipv4_arp_protocol = {
+struct arp_net_protocol ipv4_arp_protocol __arp_net_protocol = {
        .net_protocol = &ipv4_protocol,
        .check = ipv4_arp_check,
 };
-
-ARP_NET_PROTOCOL ( ipv4_arp_protocol );