From patchwork Wed Nov 3 14:41:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 517 Return-Path: Received: from nm19.bullet.mail.ukl.yahoo.com (nm19.bullet.mail.ukl.yahoo.com [217.146.183.193]) by open-mesh.org (Postfix) with SMTP id A0BCD154547 for ; Wed, 3 Nov 2010 15:43:41 +0100 (CET) Received: from [217.146.183.208] by nm19.bullet.mail.ukl.yahoo.com with NNFMP; 03 Nov 2010 14:43:40 -0000 Received: from [217.146.183.163] by tm1.bullet.mail.ukl.yahoo.com with NNFMP; 03 Nov 2010 14:43:40 -0000 Received: from [127.0.0.1] by omp1004.mail.ukl.yahoo.com with NNFMP; 03 Nov 2010 14:43:40 -0000 X-Yahoo-Newman-Id: 555265.54995.bm@omp1004.mail.ukl.yahoo.com Received: (qmail 78626 invoked from network); 3 Nov 2010 14:43:40 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.de; h=DKIM-Signature:Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=6tfIBD3PfUN8pwoJdduRahovm5rQoiNvO8iyQjUF9/v3fIMVCPE2KlOAhpq20ynHftSR6sVVnElSHzyvlroyH2LNk33CCbxSoIA3esknnBAqWHJ07hNA6DezHKPANH6Ek70iVuBdWURrpk3OhxxMVliEZc1GjYShaPlRJ+4F8sQ= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1288795420; bh=m4gDW4fMWqHPXuI6PchfoGx4vSjC9+L3042+HWvtrVU=; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=SYEWrW0nie1c2Q6wzTW8RkHgTprmmNu71UvzRudjJSzRUzrIoDjV3nIuRInmPVfx67GmynrQJ4yKyV0j8xa5oe9jHU9Hlct+hcD7IvWVKppl0BBdKlpsfk7PwfZC+aVmFUWUuA5LPlcTvv9iV6z2U2vKzamI7155ypUDVZntREY= Received: from localhost (lindner_marek@78.225.40.81 with plain) by smtp131.mail.ukl.yahoo.com with SMTP; 03 Nov 2010 14:43:40 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: MGTRKvUVM1lxAVJYpEmlAaDjJcZB9wezyOWCqpDbbnccGZ2 .VEEZBk8XuIPpahNqGjkBnkIZVEqqXpIti2G30jb.zEqMbCJuZF7_cfgb5vz oWXVamwdc9oBpZmJVFvfY6t8xQ4xF3bDHf.8hhAPbsisQgcpxDvO54C_UQkA FwyNlSrBczXOk_EqeAOTZwbD9NPTboYSw9Gz.R8d5afWGKiJmELUxWkyTCuY lzMC5uknKCsCLztzZ_D9p7cFv1Ck2IoYzZkUAgkoQwrhA_58o X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 3 Nov 2010 15:41:35 +0100 Message-Id: <1288795295-25392-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.1 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: suppress false warning when changing the mac address X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Nov 2010 14:43:42 -0000 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 --- batman-adv/hard-interface.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index 37f0f8b..63a6b3e 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -175,7 +175,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; @@ -185,11 +185,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"); } @@ -439,7 +444,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) INIT_LIST_HEAD(&batman_if->list); kref_init(&batman_if->refcount); - 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); @@ -520,7 +525,7 @@ static int hard_if_event(struct notifier_block *this, if (batman_if->if_status == IF_NOT_IN_USE) goto hardif_put; - 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);