Repository : ssh://git@open-mesh.org/batman-adv

On branch : next

commit d4e5e0143fe81cfe804e753f9d7cc3d9e6447e86 Author: Matthias Schiffer mschiffer@universe-factory.net Date: Sat Mar 16 12:30:10 2013 +0100

batman-adv: fix compat for Debian Wheezy kernel v3.2.39

Starting with kernel v3.2.39, a Debian specific patch defines eth_hw_addr_random() in include/linux/etherdevice.h, causing the build of batman-adv to fail.

This patch fixes the build on these kernels while keeping compatiblity with unpatched kernels by renaming batman-adv's compat definition of the eth_hw_addr_random() function to resolve the name conflict and adding a #define macro.

Signed-off-by: Matthias Schiffer mschiffer@universe-factory.net Signed-off-by: Marek Lindner lindner_marek@yahoo.de

d4e5e0143fe81cfe804e753f9d7cc3d9e6447e86 compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compat.h b/compat.h index 3e81434..ba07ae4 100644 --- a/compat.h +++ b/compat.h @@ -186,7 +186,9 @@ static inline void skb_reset_mac_len(struct sk_buff *skb)

#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)

-static inline void eth_hw_addr_random(struct net_device *dev) +#define eth_hw_addr_random(dev) batadv_eth_hw_addr_random(dev) + +static inline void batadv_eth_hw_addr_random(struct net_device *dev) { random_ether_addr(dev->dev_addr); }