diff options
| author |   Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-09 09:48:54 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-02-13 00:46:41 -0500 |
| commit | 1a0d6ae5795c376bae6d012fb25e8341e4c6d5f2 (patch) | |
| tree | 476d4b0b06ed78ec57f73f8dde182afc083b2b43 /include/linux/etherdevice.h | |
| parent | eth: reset addr_assign_type if eth_mac_addr() called (diff) | |
| download | linux-dev-1a0d6ae5795c376bae6d012fb25e8341e4c6d5f2.tar.xz linux-dev-1a0d6ae5795c376bae6d012fb25e8341e4c6d5f2.zip | |
rename dev_hw_addr_random and remove redundant second
Renamed dev_hw_addr_random to eth_hw_addr_random() to reflect that
this function only assign a random ethernet address (MAC). Removed
the second parameter (u8 *hwaddr), it's redundant since the also
given net_device already contains net_device->dev_addr.
Set it directly.
Adapt igbvf and ixgbevf to the changed function.
Small fix for ixgbevf_probe(): if ixgbevf_sw_init() fails
(which means the device got no dev_addr) handle the error and
jump to err_sw_init as already done by igbvf in similar case.
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 05955cf09937..8a1835855faa 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -140,17 +140,18 @@ static inline void random_ether_addr(u8 *addr) } /** - * dev_hw_addr_random - Create random MAC and set device flag + * eth_hw_addr_random - Generate software assigned random Ethernet and + * set device flag * @dev: pointer to net_device structure - * @hwaddr: Pointer to a six-byte array containing the Ethernet address * - * Generate random MAC to be used by a device and set addr_assign_type - * so the state can be read by sysfs and be used by udev. + * Generate a random Ethernet address (MAC) to be used by a net device + * and set addr_assign_type so the state can be read by sysfs and be + * used by userspace. */ -static inline void dev_hw_addr_random(struct net_device *dev, u8 *hwaddr) +static inline void eth_hw_addr_random(struct net_device *dev) { dev->addr_assign_type |= NET_ADDR_RANDOM; - random_ether_addr(hwaddr); + random_ether_addr(dev->dev_addr); } /** |