The following commit has been merged in the next branch: commit 73d9024865a95e4bbbce2c59b645236326262ced Author: Marek Lindner lindner_marek@yahoo.de Date: Thu Nov 4 13:43:22 2010 +0000

batman-adv: suppress false warning when changing the mac address

Whenever the mac address of an batman interface is changed check_known_mac_addr() is called to print a warning if the newly added mac address exists an another batman interface. While looping through the batman interface list check_known_mac_addr() only compares mac addresses and does not make sure they belong to different interfaces, thus always printing a warning.

Signed-off-by: Marek Lindner lindner_marek@yahoo.de Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

diff --git a/hard-interface.c b/hard-interface.c index 7c92c31..63e02a2 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -167,7 +167,7 @@ static void update_mac_addresses(struct batman_if *batman_if) batman_if->net_dev->dev_addr, ETH_ALEN); }

-static void check_known_mac_addr(uint8_t *addr) +static void check_known_mac_addr(struct net_device *net_dev) { struct batman_if *batman_if;

@@ -177,11 +177,16 @@ static void check_known_mac_addr(uint8_t *addr) (batman_if->if_status != IF_TO_BE_ACTIVATED)) continue;

- if (!compare_orig(batman_if->net_dev->dev_addr, addr)) + if (batman_if->net_dev == net_dev) + continue; + + if (!compare_orig(batman_if->net_dev->dev_addr, + net_dev->dev_addr)) continue;

pr_warning("The newly added mac address (%pM) already exists " - "on: %s\n", addr, batman_if->net_dev->name); + "on: %s\n", net_dev->dev_addr, + batman_if->net_dev->name); pr_warning("It is strongly recommended to keep mac addresses " "unique to avoid problems!\n"); } @@ -432,7 +437,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) atomic_set(&batman_if->refcnt, 0); hardif_hold(batman_if);

- check_known_mac_addr(batman_if->net_dev->dev_addr); + check_known_mac_addr(batman_if->net_dev);

spin_lock(&if_list_lock); list_add_tail_rcu(&batman_if->list, &if_list); @@ -517,7 +522,7 @@ static int hard_if_event(struct notifier_block *this, goto out; }

- check_known_mac_addr(batman_if->net_dev->dev_addr); + check_known_mac_addr(batman_if->net_dev); update_mac_addresses(batman_if);

bat_priv = netdev_priv(batman_if->soft_iface);