diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-19 16:35:29 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-19 17:47:13 +0100 |
| commit | a681e7f95a4df4a86b9ad284dc6dbff387774da3 (patch) | |
| tree | 26df1434d85fd43d4614182e814ab795690aace1 /backport | |
| parent | 61b3e99ad2438e5501da6a27c2e4cb8c04d7a10c (diff) | |
backports: add prefix infront of ether_addr_equal_{unaligned, 64bits}()
RedHat 6.5 already contains ether_addr_equal_64bits() which will
conflict with our declaration.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'backport')
| -rw-r--r-- | backport/backport-include/linux/etherdevice.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/backport/backport-include/linux/etherdevice.h b/backport/backport-include/linux/etherdevice.h index cf1e31f6..5560c0ca 100644 --- a/backport/backport-include/linux/etherdevice.h +++ b/backport/backport-include/linux/etherdevice.h @@ -172,7 +172,7 @@ static inline void eth_hw_addr_inherit(struct net_device *dst, * * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. */ - +#define ether_addr_equal_64bits LINUX_BACKPORT(ether_addr_equal_64bits) static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], const u8 addr2[6+2]) { @@ -200,6 +200,7 @@ static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], * * Please note: Use only when any Ethernet address may not be u16 aligned. */ +#define ether_addr_equal_unaligned LINUX_BACKPORT(ether_addr_equal_unaligned) static inline bool ether_addr_equal_unaligned(const u8 *addr1, const u8 *addr2) { #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) |