The following commit has been merged in the master branch: commit f86649b10214e8e98bdec161cefa13dcc8cb1e41 Author: Sven Eckelmann sven@narfation.org Date: Sun Feb 12 14:35:30 2012 +0100

batman-adv: Backport dev_hw_addr_random

910ccacb9dd2bfac8ce1ac411af514fe72fa84c0 introduced the hardware address initialization using dev_hw_addr_random. This function was added to linux with linux 2.6.36. Older kernel versions have to igore the NET_ADDR_RANDOM variable and use random_ether_addr directly.

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

diff --git a/compat.h b/compat.h index e90409f..88866da 100644 --- a/compat.h +++ b/compat.h @@ -104,6 +104,15 @@ static inline int __param_set_copystring(const char *val, } #define param_set_copystring __param_set_copystring

+static inline void dev_hw_addr_random(struct net_device *dev, u8 *hwaddr) +{ + random_ether_addr(hwaddr); +} + +/* hack for dev->addr_assign_type &= ~NET_ADDR_RANDOM; */ +#define addr_assign_type ifindex +#define NET_ADDR_RANDOM 0 + #endif /* < KERNEL_VERSION(2, 6, 36) */