backports: add prefix infront of ether_addr_equal_{unaligned, 64bits}()
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 19 Jan 2014 15:35:29 +0000 (16:35 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 19 Jan 2014 16:47:13 +0000 (17:47 +0100)
RedHat 6.5 already contains ether_addr_equal_64bits() which will
conflict with our declaration.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
backport/backport-include/linux/etherdevice.h

index cf1e31f6ba26d02104c943043caa4b7d1a1033f9..5560c0caae13b46384bd392809ccb02223cd2bc6 100644 (file)
@@ -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)