From patchwork Sat Jan 15 14:52:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 683 Return-Path: Received: from nm14.bullet.mail.ukl.yahoo.com (nm14.bullet.mail.ukl.yahoo.com [217.146.183.188]) by open-mesh.org (Postfix) with SMTP id 65C511545D0 for ; Sat, 15 Jan 2011 15:56:11 +0100 (CET) Received: from [217.146.183.183] by nm14.bullet.mail.ukl.yahoo.com with NNFMP; 15 Jan 2011 14:56:10 -0000 Received: from [217.146.183.162] by tm14.bullet.mail.ukl.yahoo.com with NNFMP; 15 Jan 2011 14:56:10 -0000 Received: from [127.0.0.1] by omp1003.mail.ukl.yahoo.com with NNFMP; 15 Jan 2011 14:56:10 -0000 X-Yahoo-Newman-Id: 562338.83627.bm@omp1003.mail.ukl.yahoo.com Received: (qmail 49937 invoked from network); 15 Jan 2011 14:56:10 -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=4Jd3vc+YjY44t3y4Bym7xwdz1UVHEpdU4nNB+SMQHpe8jhNv5wPsI6lJ9PwfstUibIWU/ZUvEFrYuQzqLiQgHAyiKkkyvdlPwtqCw9w4gQpuNU5PUtvFwsEfcJdoa7x/g3ggxC7ndcE+X/G06+xc+lq1ruFKQO2LPoSXerqby+k= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1295103370; bh=QvnEPJZankWPde4KW2772wDVbkgl9w4hx1T7emI4o64=; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=hC67C8QVyeZ3AN4KFN5rICjHIxetXVvsOzoPQIvaYewEjKbPcDRYo3P1hBrPa5xZy+3yf74Ti3EmY3uf2gwpN8AgWvVfjhrr1nEk0OywbizpG8Ca+kZ1gYfZVev/r9pOjbBf1gE0eMTgUTc/AnbwqbsQNCA1qe5wLSqjs4t20Uw= Received: from localhost (lindner_marek@81.57.254.118 with plain) by smtp120.mail.ukl.yahoo.com with SMTP; 15 Jan 2011 14:56:07 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: WyOPoXgVM1mBb_2JzNxeRWRWRjKDfJdCTSKHwHORr09fOmK otsgN_MsCyv4Qw76_1iOz1pDW2FDgiIUhg2UXLcdx3Gmnm.54XtOL6ycafpq 706dvYo_bWYAH2QO9iQJoGqkZ4YYDR83JfuROi.aTv4bgruSFhQkVtKEqa1b FxTLWQIhDqzNQQbudK.XsMB9405GmT2.L09d_8la5lyQ7iQpuub6fQMySUMk EGpZA1vDmBlc8Hu0UFqYexDDPO67eWGMr6WCXN6LMEAcMJGO1IZdQb3Al1b9 4R0cD6nKj7Nw1dEtTJd8mVjQxww-- X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 15 Jan 2011 15:52:53 +0100 Message-Id: <1295103173-7036-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.2.3 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: free neighbors when an interface is deactivated 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: Sat, 15 Jan 2011 14:56:11 -0000 hardif_disable_interface() calls purge_orig_ref() to immediately free all neighbors associated with the interface that is going down. purge_orig_neighbors() checked if the interface status is IF_INACTIVE which is set to IF_NOT_IN_USE shortly before calling purge_orig_ref(). Signed-off-by: Marek Lindner --- batman-adv/hard-interface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index 4f95777..52b2b72 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -398,7 +398,6 @@ void hardif_disable_interface(struct batman_if *batman_if) kfree(batman_if->packet_buff); batman_if->packet_buff = NULL; - batman_if->if_status = IF_NOT_IN_USE; /* delete all references to this batman_if */ purge_orig_ref(bat_priv); @@ -410,6 +409,7 @@ void hardif_disable_interface(struct batman_if *batman_if) softif_destroy(batman_if->soft_iface); batman_if->soft_iface = NULL; + batman_if->if_status = IF_NOT_IN_USE; } static struct batman_if *hardif_add_interface(struct net_device *net_dev)