From 4eab5bc8ca6b66dc965cf188dd4577ad19c5b879 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Tue, 11 Aug 2009 23:40:27 +0100
Subject: [netdevice] Allow the hardware and link-layer addresses to differ in
 size

IPoIB has a 20-byte link-layer address, of which only eight bytes
represent anything relating to a "hardware address".

The PXE and EFI SNP APIs expect the permanent address to be the same
size as the link-layer address, so fill in the "permanent address"
field with the initial link layer address (as generated by
register_netdev() based upon the real hardware address).
---
 src/net/80211/net80211.c |  2 ++
 src/net/ethernet.c       | 12 ++++++++++++
 src/net/netdevice.c      |  3 +--
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/net')

diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c
index f36128531..a07e2fab1 100644
--- a/src/net/80211/net80211.c
+++ b/src/net/80211/net80211.c
@@ -602,9 +602,11 @@ static struct ll_protocol net80211_ll_protocol __ll_protocol = {
 	.name = "802.11",
 	.push = net80211_ll_push,
 	.pull = net80211_ll_pull,
+	.init_addr = eth_init_addr,
 	.ntoa = eth_ntoa,
 	.mc_hash = net80211_ll_mc_hash,
 	.ll_proto = htons ( ARPHRD_ETHER ),	/* "encapsulated Ethernet" */
+	.hw_addr_len = ETH_ALEN,
 	.ll_addr_len = ETH_ALEN,
 	.ll_header_len = IEEE80211_TYP_FRAME_HEADER_LEN +
 				IEEE80211_LLC_HEADER_LEN,
diff --git a/src/net/ethernet.c b/src/net/ethernet.c
index 5e2793f94..dfeba7cd7 100644
--- a/src/net/ethernet.c
+++ b/src/net/ethernet.c
@@ -96,6 +96,16 @@ static int eth_pull ( struct net_device *netdev __unused,
 	return 0;
 }
 
+/**
+ * Initialise Ethernet address
+ *
+ * @v hw_addr		Hardware address
+ * @v ll_addr		Link-layer address
+ */
+void eth_init_addr ( const void *hw_addr, void *ll_addr ) {
+	memcpy ( ll_addr, hw_addr, ETH_ALEN );
+}
+
 /**
  * Transcribe Ethernet address
  *
@@ -143,10 +153,12 @@ static int eth_mc_hash ( unsigned int af, const void *net_addr,
 struct ll_protocol ethernet_protocol __ll_protocol = {
 	.name		= "Ethernet",
 	.ll_proto	= htons ( ARPHRD_ETHER ),
+	.hw_addr_len	= ETH_ALEN,
 	.ll_addr_len	= ETH_ALEN,
 	.ll_header_len	= ETH_HLEN,
 	.push		= eth_push,
 	.pull		= eth_pull,
+	.init_addr	= eth_init_addr,
 	.ntoa		= eth_ntoa,
 	.mc_hash	= eth_mc_hash,
 };
diff --git a/src/net/netdevice.c b/src/net/netdevice.c
index f43ca8a4d..ee0d0b72b 100644
--- a/src/net/netdevice.c
+++ b/src/net/netdevice.c
@@ -358,8 +358,7 @@ int register_netdev ( struct net_device *netdev ) {
 		   ifindex++ );
 
 	/* Set initial link-layer address */
-	memcpy ( netdev->ll_addr, netdev->hw_addr,
-		 netdev->ll_protocol->ll_addr_len );
+	netdev->ll_protocol->init_addr ( netdev->hw_addr, netdev->ll_addr );
 
 	/* Register per-netdev configuration settings */
 	if ( ( rc = register_settings ( netdev_settings ( netdev ),
-- 
cgit v1.2.3-55-g7522