Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[netdevice] Add method for generating EUI-64 address from link-layer …
…address

Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed Sep 3, 2013
1 parent d5f69e9 commit 0b65c8c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/drivers/net/ipoib.c
Expand Up @@ -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,
};

Expand Down
1 change: 1 addition & 0 deletions src/include/ipxe/ethernet.h
Expand Up @@ -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 */
9 changes: 9 additions & 0 deletions src/include/ipxe/netdevice.h
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions src/net/80211/net80211.c
Expand Up @@ -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,
Expand Down
16 changes: 16 additions & 0 deletions src/net/ethernet.c
Expand Up @@ -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",
Expand All @@ -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,
};

/**
Expand Down

0 comments on commit 0b65c8c

Please sign in to comment.