The following commit has been merged in the next branch: commit 688c216eef6b19b4a3650bdad0308a463bfd93ad Author: Sven Eckelmann sven@narfation.org Date: Wed Mar 28 13:35:05 2012 +0200

batman-adv: Use eth_hw_addr_random compat also for kernel 3.3

The changes for eth_hw_addr_random were not merged in linux 3.3. Therefore, the compat layer has to provide it.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/compat.h b/compat.h index f2cf35b..4b86902 100644 --- a/compat.h +++ b/compat.h @@ -138,13 +138,13 @@ void free_rcu_tt_local_entry(struct rcu_head *rcu); #endif /* < KERNEL_VERSION(3, 0, 0) */

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

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

-#endif /* < KERNEL_VERSION(3, 0, 0) */ +#endif /* < KERNEL_VERSION(3, 4, 0) */

#endif /* _NET_BATMAN_ADV_COMPAT_H_ */