RedHat 6.5 already contains ether_addr_equal_64bits() which will
conflict with our declaration.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
backport/backport-include/linux/etherdevice.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/backport/backport-include/linux/etherdevice.h b/backport/backport-include/linux/etherdevice.h
index cf1e31f..5560c0c 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)
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
