Merge branch 'master' of ssh://rom.etherboot.org/pub/scm/gpxe

src/include/gpxe/arp.h

@@ -30,6 +30,8 @@ struct arp_net_protocol {
 #define __arp_net_protocol \
 	__table ( struct arp_net_protocol, arp_net_protocols, 01 )
 
+extern struct net_protocol arp_protocol;
+
 extern int arp_resolve ( struct net_device *netdev,
 			 struct net_protocol *net_protocol,
 			 const void *dest_net_addr,

src/include/gpxe/device.h

@@ -27,6 +27,12 @@ struct device_description {
 	unsigned int vendor;
 	/** Device ID */
 	unsigned int device;
+	/** Device class */
+	unsigned long class;
+	/** I/O address */
+	unsigned long ioaddr;
+	/** IRQ */
+	unsigned int irq;
 };
 
 /** PCI bus type */

src/include/gpxe/netdevice.h

@@ -122,6 +122,8 @@ struct ll_protocol {
 	uint16_t ll_proto;
 	/** Link-layer address length */
 	uint8_t ll_addr_len;
+	/** Link-layer header length */
+	uint8_t ll_header_len;
 	/** Link-layer broadcast address */
 	const uint8_t *ll_broadcast;
 };

src/include/gpxe/rarp.h

@@ -0,0 +1,14 @@
+#ifndef _GPXE_RARP_H
+#define _GPXE_RARP_H
+
+/** @file
+ *
+ * Reverse Address Resolution Protocol
+ *
+ */
+
+struct net_protocol;
+
+extern struct net_protocol rarp_protocol;
+
+#endif /* _GPXE_RARP_H */

src/include/pxe.h

@@ -137,4 +137,6 @@ struct pcir_header {
 
 extern struct net_device *pxe_netdev;
 
+extern void pxe_set_netdev ( struct net_device *netdev );
+
 #endif /* PXE_H */