The following commit has been merged in the master branch: commit 44e92bc8d6366ebe477cab23199b9f50328d326a Author: Antonio Quartulli ordex@autistici.org Date: Sat May 21 01:33:07 2011 +0200

batman-adv: use is_broadcast_ether_addr() instead of compare_eth(.., brd_addr)

Instead of comparing mac addresses with the broadcast address by means of compare_eth(), the is_broadcast_ether_addr() kernel function has to be used.

Signed-off-by: Antonio Quartulli ordex@autistici.org Acked-by: Sven Eckelmann sven@narfation.org Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 07f23ba..90ae6f0 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -661,7 +661,7 @@ void receive_bat_packet(const struct ethhdr *ethhdr, hard_iface->net_dev->dev_addr)) is_my_oldorig = 1;

- if (compare_eth(ethhdr->h_source, broadcast_addr)) + if (is_broadcast_ether_addr(ethhdr->h_source)) is_broadcast = 1; } rcu_read_unlock();