datapath: Add support for kernel 3.14.

[sliver-openvswitch.git] / datapath / linux / compat / include / linux / etherdevice.h

diff --git a/datapath/linux/compat/include/linux/etherdevice.h b/datapath/linux/compat/include/linux/etherdevice.h
index b2c3353..c6e8e92 100644 (file)
--- a/datapath/linux/compat/include/linux/etherdevice.h
+++ b/datapath/linux/compat/include/linux/etherdevice.h
@@ -4,6 +4,7 @@
 #include <linux/version.h>
 #include_next <linux/etherdevice.h>
 
+#ifndef HAVE_ETH_HW_ADDR_RANDOM
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 static inline void eth_hw_addr_random(struct net_device *dev)
 {
@@ -15,6 +16,7 @@ static inline void eth_hw_addr_random(struct net_device *dev)
        dev_hw_addr_random(dev, dev->dev_addr);
 }
 #endif
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
 #define eth_mac_addr rpl_eth_mac_addr
@@ -32,4 +34,21 @@ static inline int eth_mac_addr(struct net_device *dev, void *p)
 }
 #endif
 
+#ifndef HAVE_ETHER_ADDR_COPY
+static inline void ether_addr_copy(u8 *dst, const u8 *src)
+{
+#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
+       *(u32 *)dst = *(const u32 *)src;
+       *(u16 *)(dst + 4) = *(const u16 *)(src + 4);
+#else
+       u16 *a = (u16 *)dst;
+       const u16 *b = (const u16 *)src;
+
+       a[0] = b[0];
+       a[1] = b[1];
+       a[2] = b[2];
+#endif
+}
+#endif
+
 #endif