From patchwork Thu Jun 30 08:09:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 16407 X-Patchwork-Delegate: mareklindner@neomailbox.ch Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id B8CD082232; Thu, 30 Jun 2016 10:09:36 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=c0d3.blue Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a01:4f8:171:314c::100:a1; helo=mail.aperture-lab.de; envelope-from=linus.luessing@c0d3.blue; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=c0d3.blue Received: from mail.aperture-lab.de (mail.aperture-lab.de [IPv6:2a01:4f8:171:314c::100:a1]) by open-mesh.org (Postfix) with ESMTPS id B9A908222D for ; Thu, 30 Jun 2016 10:09:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.aperture-lab.de (Postfix) with ESMTP id 54B34E1528; Thu, 30 Jun 2016 10:09:28 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aperture-lab.de Received: from mail.aperture-lab.de ([127.0.0.1]) by localhost (mail.aperture-lab.de [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id D8FhfHsMq1JN; Thu, 30 Jun 2016 10:09:28 +0200 (CEST) Received: from localhost (unknown [IPv6:2001:67c:2d50:0:c85:8cff:fe0f:63fe]) (Authenticated sender: linus.luessing@c0d3.blue) by mail.aperture-lab.de (Postfix) with ESMTPSA; Thu, 30 Jun 2016 10:09:27 +0200 (CEST) From: =?UTF-8?q?Linus=20L=C3=BCssing?= To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 30 Jun 2016 10:09:25 +0200 Message-Id: <1467274165-2866-1-git-send-email-linus.luessing@c0d3.blue> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: Fix Kconfig dependencies regarding multicast optimizations X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" Since recently the multicast optimizations are using functions from the bridge module. If batman-adv is a kernel built-in, then these bridge functions need to be accessible immediately. Thus adding a Kconfig dependency for the multicast optimizations to depend on batman-adv being built as a module if the bridge is built as a module, too. This fixes build errors like the following: ~~~ net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b7eb): undefined reference to `br_multicast_has_querier_anywhere' net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b7fa): undefined reference to `br_multicast_has_querier_adjacent' net/built-in.o: In function `batadv_mcast_mla_update': (.text+0x19b809): undefined reference to `br_multicast_has_querier_anywhere' net/built-in.o: In function `batadv_mcast_mla_update': (.text+0x19b818): undefined reference to `br_multicast_has_querier_adjacent' net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b8cf): undefined reference to `br_multicast_list_adjacent' ~~~ Fixes: 391b59cdb111 ("batman-adv: Add multicast optimization support for bridged setups") Reported-by: kbuild test robot Signed-off-by: Linus Lüssing Reviewed-by: Sven Eckelmann --- net/batman-adv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index b7ba97d..833bb14 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -66,7 +66,7 @@ config BATMAN_ADV_NC config BATMAN_ADV_MCAST bool "Multicast optimisation" - depends on BATMAN_ADV && INET + depends on BATMAN_ADV && INET && !(BRIDGE=m && BATMAN_ADV=y) default n help This option enables the multicast optimisation which aims to