diff options
author | Marek Lindner <lindner_marek@yahoo.de> | 2010-11-04 18:02:30 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-09 19:21:27 -0500 |
commit | 4d774a7fed886522f55119ef524cbe3c90bbdc38 (patch) | |
tree | fde5725268a44fb9a83f5b5d8e967624e052b9bf | |
parent | f581cf21b48c305c6fbbc3db5ef905deb19131e5 (diff) |
Staging: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/batman-adv/hard-interface.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c index 80cfa866958..b68a7e5173b 100644 --- a/drivers/staging/batman-adv/hard-interface.c +++ b/drivers/staging/batman-adv/hard-interface.c | |||
@@ -165,7 +165,7 @@ static void update_mac_addresses(struct batman_if *batman_if) | |||
165 | batman_if->net_dev->dev_addr, ETH_ALEN); | 165 | batman_if->net_dev->dev_addr, ETH_ALEN); |
166 | } | 166 | } |
167 | 167 | ||
168 | static void check_known_mac_addr(uint8_t *addr) | 168 | static void check_known_mac_addr(struct net_device *net_dev) |
169 | { | 169 | { |
170 | struct batman_if *batman_if; | 170 | struct batman_if *batman_if; |
171 | 171 | ||
@@ -175,11 +175,16 @@ static void check_known_mac_addr(uint8_t *addr) | |||
175 | (batman_if->if_status != IF_TO_BE_ACTIVATED)) | 175 | (batman_if->if_status != IF_TO_BE_ACTIVATED)) |
176 | continue; | 176 | continue; |
177 | 177 | ||
178 | if (!compare_orig(batman_if->net_dev->dev_addr, addr)) | 178 | if (batman_if->net_dev == net_dev) |
179 | continue; | ||
180 | |||
181 | if (!compare_orig(batman_if->net_dev->dev_addr, | ||
182 | net_dev->dev_addr)) | ||
179 | continue; | 183 | continue; |
180 | 184 | ||
181 | pr_warning("The newly added mac address (%pM) already exists " | 185 | pr_warning("The newly added mac address (%pM) already exists " |
182 | "on: %s\n", addr, batman_if->net_dev->name); | 186 | "on: %s\n", net_dev->dev_addr, |
187 | batman_if->net_dev->name); | ||
183 | pr_warning("It is strongly recommended to keep mac addresses " | 188 | pr_warning("It is strongly recommended to keep mac addresses " |
184 | "unique to avoid problems!\n"); | 189 | "unique to avoid problems!\n"); |
185 | } | 190 | } |
@@ -430,7 +435,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) | |||
430 | atomic_set(&batman_if->refcnt, 0); | 435 | atomic_set(&batman_if->refcnt, 0); |
431 | hardif_hold(batman_if); | 436 | hardif_hold(batman_if); |
432 | 437 | ||
433 | check_known_mac_addr(batman_if->net_dev->dev_addr); | 438 | check_known_mac_addr(batman_if->net_dev); |
434 | 439 | ||
435 | spin_lock(&if_list_lock); | 440 | spin_lock(&if_list_lock); |
436 | list_add_tail_rcu(&batman_if->list, &if_list); | 441 | list_add_tail_rcu(&batman_if->list, &if_list); |
@@ -515,7 +520,7 @@ static int hard_if_event(struct notifier_block *this, | |||
515 | goto out; | 520 | goto out; |
516 | } | 521 | } |
517 | 522 | ||
518 | check_known_mac_addr(batman_if->net_dev->dev_addr); | 523 | check_known_mac_addr(batman_if->net_dev); |
519 | update_mac_addresses(batman_if); | 524 | update_mac_addresses(batman_if); |
520 | 525 | ||
521 | bat_priv = netdev_priv(batman_if->soft_iface); | 526 | bat_priv = netdev_priv(batman_if->soft_iface); |