From d09290161e33574d8f0fa900ebe739214d17fe1a Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Fri, 17 Jul 2009 22:48:31 +0100
Subject: [netdevice] Make ll_broadcast per-netdevice rather than
 per-ll_protocol

IPoIB has a link-layer broadcast address that varies according to the
partition key.  We currently go through several contortions to pretend
that the link-layer address is a fixed constant; by making the
broadcast address a property of the network device rather than the
link-layer protocol it will be possible to simplify IPoIB's broadcast
handling.
---
 src/include/gpxe/ethernet.h  | 22 +---------------------
 src/include/gpxe/ipoib.h     | 21 +--------------------
 src/include/gpxe/netdevice.h |  4 ++--
 3 files changed, 4 insertions(+), 43 deletions(-)

(limited to 'src/include')

diff --git a/src/include/gpxe/ethernet.h b/src/include/gpxe/ethernet.h
index 45ab9a092..9bd3455c5 100644
--- a/src/include/gpxe/ethernet.h
+++ b/src/include/gpxe/ethernet.h
@@ -10,28 +10,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/if_ether.h>
-
-extern struct ll_protocol ethernet_protocol;
 
 extern const char * eth_ntoa ( const void *ll_addr );
-
-/**
- * Allocate Ethernet device
- *
- * @v priv_size		Size of driver private data
- * @ret netdev		Network device, or NULL
- */
-static inline struct net_device * alloc_etherdev ( size_t priv_size ) {
-	struct net_device *netdev;
-
-	netdev = alloc_netdev ( priv_size );
-	if ( netdev ) {
-		netdev->ll_protocol = &ethernet_protocol;
-		netdev->max_pkt_len = ETH_FRAME_LEN;
-	}
-	return netdev;
-}
+extern struct net_device * alloc_etherdev ( size_t priv_size );
 
 #endif /* _GPXE_ETHERNET_H */
diff --git a/src/include/gpxe/ipoib.h b/src/include/gpxe/ipoib.h
index 5db238479..79d7b3fbc 100644
--- a/src/include/gpxe/ipoib.h
+++ b/src/include/gpxe/ipoib.h
@@ -54,29 +54,10 @@ struct ipoib_hdr {
 	} __attribute__ (( packed )) u;
 } __attribute__ (( packed ));
 
-extern struct ll_protocol ipoib_protocol;
-
 extern const char * ipoib_ntoa ( const void *ll_addr );
-
-/**
- * Allocate IPoIB device
- *
- * @v priv_size		Size of driver private data
- * @ret netdev		Network device, or NULL
- */
-static inline struct net_device * alloc_ipoibdev ( size_t priv_size ) {
-	struct net_device *netdev;
-
-	netdev = alloc_netdev ( priv_size );
-	if ( netdev ) {
-		netdev->ll_protocol = &ipoib_protocol;
-		netdev->max_pkt_len = IPOIB_PKT_LEN;
-	}
-	return netdev;
-}
-
 extern void ipoib_link_state_changed ( struct ib_device *ibdev );
 extern int ipoib_probe ( struct ib_device *ibdev );
 extern void ipoib_remove ( struct ib_device *ibdev );
+extern struct net_device * alloc_ipoibdev ( size_t priv_size );
 
 #endif /* _GPXE_IPOIB_H */
diff --git a/src/include/gpxe/netdevice.h b/src/include/gpxe/netdevice.h
index 70644af1e..0f191dd68 100644
--- a/src/include/gpxe/netdevice.h
+++ b/src/include/gpxe/netdevice.h
@@ -144,8 +144,6 @@ struct ll_protocol {
 	uint8_t ll_addr_len;
 	/** Link-layer header length */
 	uint8_t ll_header_len;
-	/** Link-layer broadcast address */
-	const uint8_t *ll_broadcast;
 };
 
 /** Network device operations */
@@ -261,6 +259,8 @@ struct net_device {
 	 * For Ethernet, this is the MAC address.
 	 */
 	uint8_t ll_addr[MAX_LL_ADDR_LEN];
+	/** Link-layer broadcast address */
+	const uint8_t *ll_broadcast;
 
 	/** Current device state
 	 *
-- 
cgit v1.2.3-55-g7522