diff options
| author | Michael Brown | 2013-08-30 20:05:03 +0200 |
|---|---|---|
| committer | Michael Brown | 2013-09-03 02:24:15 +0200 |
| commit | 0b65c8cad6ed1b03ce1870856b3496c7be1f8bf1 (patch) | |
| tree | 7735c595a01cf81212490caa99e7ad7cfffb81f5 | |
| parent | [netdevice] Add concept of a network device index (diff) | |
| download | ipxe-0b65c8cad6ed1b03ce1870856b3496c7be1f8bf1.tar.gz ipxe-0b65c8cad6ed1b03ce1870856b3496c7be1f8bf1.tar.xz ipxe-0b65c8cad6ed1b03ce1870856b3496c7be1f8bf1.zip | |
[netdevice] Add method for generating EUI-64 address from link-layer address
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/drivers/net/ipoib.c | 1 | ||||
| -rw-r--r-- | src/include/ipxe/ethernet.h | 1 | ||||
| -rw-r--r-- | src/include/ipxe/netdevice.h | 9 | ||||
| -rw-r--r-- | src/net/80211/net80211.c | 1 | ||||
| -rw-r--r-- | src/net/ethernet.c | 16 |
5 files changed, 28 insertions, 0 deletions
diff --git a/src/drivers/net/ipoib.c b/src/drivers/net/ipoib.c index c1b8cad9..1b539177 100644 --- a/src/drivers/net/ipoib.c +++ b/src/drivers/net/ipoib.c @@ -265,6 +265,7 @@ struct ll_protocol ipoib_protocol __ll_protocol = { .ntoa = eth_ntoa, .mc_hash = eth_mc_hash, .eth_addr = eth_eth_addr, + .eui64 = eth_eui64, .flags = LL_NAME_ONLY, }; diff --git a/src/include/ipxe/ethernet.h b/src/include/ipxe/ethernet.h index 1794ff67..5ffc45b7 100644 --- a/src/include/ipxe/ethernet.h +++ b/src/include/ipxe/ethernet.h @@ -91,6 +91,7 @@ extern const char * eth_ntoa ( const void *ll_addr ); extern int eth_mc_hash ( unsigned int af, const void *net_addr, void *ll_addr ); extern int eth_eth_addr ( const void *ll_addr, void *eth_addr ); +extern int eth_eui64 ( const void *ll_addr, void *eui64 ); extern struct net_device * alloc_etherdev ( size_t priv_size ); #endif /* _IPXE_ETHERNET_H */ diff --git a/src/include/ipxe/netdevice.h b/src/include/ipxe/netdevice.h index 7288ad86..7f819d9a 100644 --- a/src/include/ipxe/netdevice.h +++ b/src/include/ipxe/netdevice.h @@ -175,8 +175,17 @@ struct ll_protocol { * * @v ll_addr Link-layer address * @v eth_addr Ethernet-compatible address to fill in + * @ret rc Return status code */ int ( * eth_addr ) ( const void *ll_addr, void *eth_addr ); + /** + * Generate EUI-64 address + * + * @v ll_addr Link-layer address + * @v eui64 EUI-64 address to fill in + * @ret rc Return status code + */ + int ( * eui64 ) ( const void *ll_addr, void *eui64 ); /** Link-layer protocol * * This is an ARPHRD_XXX constant, in network byte order. diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c index 54df7905..3893f652 100644 --- a/src/net/80211/net80211.c +++ b/src/net/80211/net80211.c @@ -599,6 +599,7 @@ static struct ll_protocol net80211_ll_protocol __ll_protocol = { .ntoa = eth_ntoa, .mc_hash = eth_mc_hash, .eth_addr = eth_eth_addr, + .eui64 = eth_eui64, .ll_proto = htons ( ARPHRD_ETHER ), /* "encapsulated Ethernet" */ .hw_addr_len = ETH_ALEN, .ll_addr_len = ETH_ALEN, diff --git a/src/net/ethernet.c b/src/net/ethernet.c index 4fd2ab6e..013b2d76 100644 --- a/src/net/ethernet.c +++ b/src/net/ethernet.c @@ -165,6 +165,21 @@ int eth_eth_addr ( const void *ll_addr, void *eth_addr ) { return 0; } +/** + * Generate EUI-64 address + * + * @v ll_addr Link-layer address + * @v eui64 EUI-64 address to fill in + * @ret rc Return status code + */ +int eth_eui64 ( const void *ll_addr, void *eui64 ) { + + memcpy ( ( eui64 + 0 ), ( ll_addr + 0 ), 3 ); + memcpy ( ( eui64 + 5 ), ( ll_addr + 3 ), 3 ); + *( ( uint16_t * ) ( eui64 + 3 ) ) = htons ( 0xfffe ); + return 0; +} + /** Ethernet protocol */ struct ll_protocol ethernet_protocol __ll_protocol = { .name = "Ethernet", @@ -178,6 +193,7 @@ struct ll_protocol ethernet_protocol __ll_protocol = { .ntoa = eth_ntoa, .mc_hash = eth_mc_hash, .eth_addr = eth_eth_addr, + .eui64 = eth_eui64, }; /** |