diff options
| author | Michael Brown | 2006-08-08 19:44:25 +0200 |
|---|---|---|
| committer | Michael Brown | 2006-08-08 19:44:25 +0200 |
| commit | 68e33224efd8f2116cd107a84d478db761982d85 (patch) | |
| tree | 2729aab0859a78a94c1e1f9c7b6576f372141110 | |
| parent | Removed some bugs in TCP (diff) | |
| download | ipxe-68e33224efd8f2116cd107a84d478db761982d85.tar.gz ipxe-68e33224efd8f2116cd107a84d478db761982d85.tar.xz ipxe-68e33224efd8f2116cd107a84d478db761982d85.zip | |
gcc3 compatibility: removed ARP_NET_PROTOCOL().
| -rw-r--r-- | src/include/gpxe/arp.h | 9 | ||||
| -rw-r--r-- | src/net/ipv4.c | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/include/gpxe/arp.h b/src/include/gpxe/arp.h index ffaf418a1..8ff1cff02 100644 --- 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 bfef358df..4c07c2c91 100644 --- 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 ); |