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 Linux Kernel,
eth_rand_addr(), for consistency.
Because eth_rand_addr() is impilemented as inline function,
it should not be surrounded by ifdef CONFIG_RANDOM_MACADDR.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
---
board/buffalo/lsxl/lsxl.c | 2 +-
drivers/net/dm9000x.c | 2 +-
drivers/net/ftmac110.c| 2 +-
include/net.h | 36 +++-
net/eth.c | 22 --
5 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index eca1683..659a124 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -231,7 +231,7 @@ static void rescue_mode(void)
printf(Entering rescue mode..\n);
#ifdef CONFIG_RANDOM_MACADDR
if (!eth_getenv_enetaddr(ethaddr, enetaddr)) {
- eth_random_enetaddr(enetaddr);
+ eth_random_addr(enetaddr);
if (eth_setenv_enetaddr(ethaddr, enetaddr)) {
printf(Failed to set ethernet address\n);
set_led(LED_ALARM_BLINKING);
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index b68d808..4de9d41 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -345,7 +345,7 @@ static int dm9000_init(struct eth_device *dev, bd_t *bd)
if (!is_valid_ether_addr(dev-enetaddr)) {
#ifdef CONFIG_RANDOM_MACADDR
printf(Bad MAC address (uninitialized EEPROM?),
randomizing\n);
- eth_random_enetaddr(dev-enetaddr);
+ eth_random_addr(dev-enetaddr);
printf(MAC: %pM\n, dev-enetaddr);
#else
printf(WARNING: Bad MAC address (uninitialized EEPROM?)\n);
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 8eee272..98c4f09 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -425,7 +425,7 @@ int ftmac110_initialize(bd_t *bis)
dev-recv = ftmac110_recv;
if (!eth_getenv_enetaddr_by_index(eth, card_nr, dev-enetaddr))
- eth_random_enetaddr(dev-enetaddr);
+ eth_random_addr(dev-enetaddr);
/* allocate tx descriptors (it must be 16 bytes aligned) */
chip-txd = dma_alloc_coherent(
diff --git a/include/net.h b/include/net.h
index 0802fad..735b0b9 100644
--- a/include/net.h
+++ b/include/net.h
@@ -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);
diff --git a/net/eth.c b/net/eth.c
index 32bd10c..99386e3 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -63,28 +63,6 @@ static int eth_mac_skip(int index)
return ((skip_state = getenv(enetvar)) != NULL);
}
-#ifdef CONFIG_RANDOM_MACADDR
-void eth_random_enetaddr(uchar *enetaddr)
-{
- uint32_t rval;
-
- srand(get_timer(0));
-
- rval = rand();
- enetaddr[0] = rval 0xff;
- enetaddr[1] = (rval 8) 0xff;
- enetaddr[2] = (rval 16) 0xff;
-
- rval = rand();
