From patchwork Wed Dec 7 10:02:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1420 Return-Path: Received: from nm12-vm0.bullet.mail.ukl.yahoo.com (nm12-vm0.bullet.mail.ukl.yahoo.com [217.146.183.246]) by open-mesh.org (Postfix) with SMTP id 609766008A2 for ; Wed, 7 Dec 2011 11:03:00 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.215] by nm12.bullet.mail.ukl.yahoo.com with NNFMP; 07 Dec 2011 10:03:00 -0000 Received: from [77.238.184.63] by tm8.bullet.mail.ukl.yahoo.com with NNFMP; 07 Dec 2011 10:03:00 -0000 Received: from [127.0.0.1] by smtp132.mail.ukl.yahoo.com with NNFMP; 07 Dec 2011 10:03:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1323252180; bh=ZUyYPi7ejt13GX1xOJdF/FNLC4DQmfzpOmpltKH2HSA=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=mGKARO/PmJIHLhdUT27DY+siFbVsYxNn/8FHvpqBqnonAvuJ6FpvWJiskCtG+Saf/NtMewIiqSJvLXLQVO3SPvadGdKQZnJvRXp3O7jyzxRWVAa4xVf/UNLJnOmuWE3/yPrfh91d9Ntb86qE/E46hheLzDOSuI5j20C4bQ1KMrU= X-Yahoo-Newman-Id: 131926.66153.bm@smtp132.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: XXD64goVM1nOPF6OuIU74w6hF4pGBnj5hADk5QPXXp2TtuJ I9qH7NdmiMbiOAyTsEE4YxsOpgyQlNY6VzE9Nh.8TqCyI1GT7sSyfMD09UhL RV1spT8DmZ4ET4SrJEtNtgOqvXTSsZWck.ZSzvyuh00Q2I4YvZhSkCcM6aqd u.YDctGlBULOhgs.Wq.wttLz_mQCalepVVg1Sm5nL5zzyvWutmq5fpnGnrEm Yww9yAiFfBCvnqe.n9pRt_sXHW0LH77OKczwsfvyEAhuJUUZb3FwMlHrsgNc g5Ca5GcyfGYPRdrcpZGRPHjC9eQWNC6VNy_cQJ6UCIgGaslvdT.m2xa6kTZt xXs2Q0XA6PU.pK6pOcatj66Pvw293fZMnxNLdMlJizzJgZyXhfyHKxJZ6V1M Qe2.SgY60xUBjGWB6_zPxAPrKTF7iN98hObTOzGzwJ.uXJ1.T9tHAElp6clr Llqsrutt6Pw-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp132.mail.ukl.yahoo.com with SMTP; 07 Dec 2011 10:02:59 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 7 Dec 2011 18:02:50 +0800 Message-Id: <1323252170-13257-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: warn if added interface is part of a bridge X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 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, 07 Dec 2011 10:03:00 -0000 Signed-off-by: Marek Lindner --- Thanks to Sven we even have a 'nice' compat.h workaround. :) compat.h | 1 + hard-interface.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/compat.h b/compat.h index 964c066..dcd92d1 100644 --- a/compat.h +++ b/compat.h @@ -52,6 +52,7 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) #define __rcu +#define IFF_BRIDGE_PORT 0 || (hard_iface->net_dev->br_port ? 1 : 0) #endif /* < KERNEL_VERSION(2, 6, 36) */ diff --git a/hard-interface.c b/hard-interface.c index d3e0e32..68b667c 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -281,6 +281,14 @@ int hardif_enable_interface(struct hard_iface *hard_iface, if (!atomic_inc_not_zero(&hard_iface->refcount)) goto out; + /* hard-interface is part of a bridge */ + if (hard_iface->net_dev->priv_flags & IFF_BRIDGE_PORT) + pr_err("You are about to enable batman-adv on '%s' which " + "already is part of a bridge. Unless you know exactly " + "what you are doing this is probably wrong and won't " + "work the way you think it would.\n", + hard_iface->net_dev->name); + soft_iface = dev_get_by_name(&init_net, iface_name); if (!soft_iface) {