From patchwork Wed May 19 19:11:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 159 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id 9055E1542F6 for ; Wed, 19 May 2010 15:48:04 +0200 (CEST) Received: (qmail invoked by alias); 19 May 2010 19:11:47 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [89.246.192.108] by mail.gmx.net (mp009) with SMTP; 19 May 2010 21:11:47 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX19t1akPripthSCysuI2Y+RDaSwNJXsX3BdVUgfQyz 7Aejht181pbEiy From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 19 May 2010 21:11:42 +0200 Message-Id: <1274296302-17845-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274277722-25571-1-git-send-email-sven.eckelmann@gmx.de> References: <1274277722-25571-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH-maint] batman-adv: Don't call free_netdev twice 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, 19 May 2010 13:48:05 -0000 Free_netdev is registered as destructor in interface_setup for every soft_device. This destructor is automatically called from unregister_netdev and we must not call it again for the free'd net_device. Signed-off-by: Sven Eckelmann --- This patch is created for maint and should be applied using `git am`. Following patches should be applied before: * batman-adv: Move device for icmp injection to debugfs * batman-adv: Move tables from sysfs to debugfs * batman-adv: Call unregister_netdev on failures to get rtnl lock main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/main.c b/main.c index 6e6d925..6c6df6b 100644 --- a/main.c +++ b/main.c @@ -138,6 +138,9 @@ unreg_sysfs: sysfs_del_meshif(soft_device); unreg_soft_device: unregister_netdev(soft_device); + soft_device = NULL; + return -ENOMEM; + free_soft_device: free_netdev(soft_device); soft_device = NULL;