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/ethernet.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/net/ethernet.c')

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,
 };
-- 
cgit v1.2.3-55-g7522