diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/etherdevice.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index d426336d92d9..b006ba0a9f42 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h | |||
| @@ -151,6 +151,17 @@ static inline void eth_broadcast_addr(u8 *addr) | |||
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | /** | 153 | /** |
| 154 | * eth_zero_addr - Assign zero address | ||
| 155 | * @addr: Pointer to a six-byte array containing the Ethernet address | ||
| 156 | * | ||
| 157 | * Assign the zero address to the given address array. | ||
| 158 | */ | ||
| 159 | static inline void eth_zero_addr(u8 *addr) | ||
| 160 | { | ||
| 161 | memset(addr, 0x00, ETH_ALEN); | ||
| 162 | } | ||
| 163 | |||
| 164 | /** | ||
| 154 | * eth_hw_addr_random - Generate software assigned random Ethernet and | 165 | * eth_hw_addr_random - Generate software assigned random Ethernet and |
| 155 | * set device flag | 166 | * set device flag |
| 156 | * @dev: pointer to net_device structure | 167 | * @dev: pointer to net_device structure |