Skip to content

Commit

Permalink
etherdevice: Rename random_ether_addr to eth_random_addr
Browse files Browse the repository at this point in the history
Add some API symmetry to eth_broadcast_addr and
add a #define to the old name for backward compatibility.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Joe Perches authored and David S. Miller committed Jul 17, 2012
1 parent 07689b0 commit 0a4dd59
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions include/linux/etherdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,21 @@ static inline bool is_valid_ether_addr(const u8 *addr)
}

/**
* random_ether_addr - Generate software assigned random Ethernet address
* 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 random_ether_addr(u8 *addr)
static inline void eth_random_addr(u8 *addr)
{
get_random_bytes (addr, ETH_ALEN);
addr [0] &= 0xfe; /* clear multicast bit */
addr [0] |= 0x02; /* set local assignment bit (IEEE802) */
get_random_bytes(addr, ETH_ALEN);
addr[0] &= 0xfe; /* clear multicast bit */
addr[0] |= 0x02; /* set local assignment bit (IEEE802) */
}

#define random_ether_addr(addr) eth_random_addr(addr)

/**
* eth_broadcast_addr - Assign broadcast address
* @addr: Pointer to a six-byte array containing the Ethernet address
Expand All @@ -160,7 +162,7 @@ static inline void eth_broadcast_addr(u8 *addr)
static inline void eth_hw_addr_random(struct net_device *dev)
{
dev->addr_assign_type |= NET_ADDR_RANDOM;
random_ether_addr(dev->dev_addr);
eth_random_addr(dev->dev_addr);
}

/**
Expand Down

0 comments on commit 0a4dd59

Please sign in to comment.