yair/u-boot-tk1-som
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: rename and refactor eth_rand_ethaddr() function

Browse Source 
Some functions in include/net.h are ported from
include/linux/etherdevice.h of Linux Kernel.

For ex.
  is_zero_ether_addr()
  is_multicast_ether_addr()
  is_broadcast_ether_addr()
  is_valid_ether_addr();

So, we should use the same function name as that of Linux Kernel,
eth_rand_addr(), for consistency.

Besides, eth_rand_addr() has been implemented as an inline function.
So it should not be surrounded by #ifdef CONFIG_RANDOM_MACADDR.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Masahiro Yamada
2014-04-18 19:09:48 +09:00
committed by Tom Rini
parent c85bb5a01a
commit da384a9d76
5 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/net.h
View File

@@ -130,23 +130,6 @@ extern int eth_setenv_enetaddr(char *name, const uchar *enetaddr);
extern int eth_getenv_enetaddr_by_index(const char *base_name, int index,
uchar *enetaddr);
#ifdef CONFIG_RANDOM_MACADDR
/*
* The u-boot policy does not allow hardcoded ethernet addresses. Under the
* following circumstances a random generated address is allowed:
* - in emergency cases, where you need a working network connection to set
* the ethernet address.
* Eg. you want a rescue boot and don't have a serial port to access the
* CLI to set environment variables.
*
* In these cases, we generate a random locally administered ethernet address.
*
* Args:
* enetaddr - returns 6 byte hardware address
*/
extern void eth_random_enetaddr(uchar *enetaddr);
#endif
extern int usb_eth_initialize(bd_t *bi);
extern int eth_init(bd_t *bis); /* Initialize the device */
extern int eth_send(void *packet, int length); /* Send a packet */
@@ -674,6 +657,25 @@ static inline int is_valid_ether_addr(const u8 *addr)
return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr);
}
/**
* eth_random_addr - Generate software assigned random Ethernet address
* @addr: Pointer to a six-byte array containing the Ethernet address
*
* Generate a random Ethernet address (MAC) that is not multicast
* and has the local assigned bit set.
*/
static inline void eth_random_addr(uchar *addr)
{
int i;
unsigned int seed = get_timer(0);
for (i = 0; i < 6; i++)
addr[i] = rand_r(&seed);
addr[0] &= 0xfe; /* clear multicast bit */
addr[0] |= 0x02; /* set local assignment bit (IEEE802) */
}
/* Convert an IP address to a string */
extern void ip_to_string(IPaddr_t x, char *s);