From patchwork Mon Nov 13 13:57:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118745 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1824603qgn; Mon, 13 Nov 2017 05:58:39 -0800 (PST) X-Google-Smtp-Source: AGs4zMb+8zDK0cBJFMZJd2vDNLxYDtXMH1RJPMh75RqHLkzLvMD9ojTrRK4yfitpuKU+vWQrQYWv X-Received: by 10.159.198.131 with SMTP id g3mr9123178plo.337.1510581519184; Mon, 13 Nov 2017 05:58:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510581519; cv=none; d=google.com; s=arc-20160816; b=AJEHKCOUmAhEPB9my26NKOdVSKVcQnfdIEufFwPxagqRdBj+rr6jBELIvp1Bypav9d BGr8SCZjCqzVyx6bKyyk/Txznc4hQLUBsqZhA+cbqSlb8XxPcg5XDlMQq9Yz6GRTBT9Z H6UizgNbmqQuKttoOjIRaIkyL/wtqrzJTfVfzvCwnt5qp5Se8zgTeA9g7RHhPXNbNiX/ BvUSZUgrGB4IqaSKEUc6sn2CcqyA5VnpYkli61Sx2pxWjrZq7cBh9Mc7qg6RzdU3FkN8 Y3FyrmbZ5VNMzRqIa2VYwVCG03T4SItT1GkCH5hkPA0C4UPOFZ0zoTzMfKnfGs/ac7eu iynQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=rw/AnNma1kJEN5x8lzQmpEA8Nyk1GVZu793d8dCGSq8=; b=WSR6JLjHAKQJA9rV5zinkdAgm8jZyhEY6NzxwIWHd1Ku6lBzSrESjdBEZo+xWSWYqv +6AGKUZ2mrYfpoVr2t4fiPEx9XB98aoYhZV9tHhSAgBEqZAzQGmDCCRrxHL2nXMjZWnX qr53w7uGOBanOa8v9h/xPGhuQI48EXyFf19ImRKMUz5uSlnB3jCH7VUNxWO8sY6IIPX1 Pnqh0jpHbjh5pzqsxRkIBghk34jk0x0FnXKtddy6VbpFCEGQRw05RoOqy4MXmjhGEjBK kpYz43TlMvTUMdqpv2urxXlUuDrudv5tVgz5BEHHFIg2pLeZ7L/uWv01BIM8IHH3v+HQ tV1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b29si15361802pfh.302.2017.11.13.05.58.38; Mon, 13 Nov 2017 05:58:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752814AbdKMN6h (ORCPT + 27 others); Mon, 13 Nov 2017 08:58:37 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:57526 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbdKMN6f (ORCPT ); Mon, 13 Nov 2017 08:58:35 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LaD2U-1evWg31sn0-00m5xk; Mon, 13 Nov 2017 14:58:01 +0100 From: Arnd Bergmann To: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" Cc: Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: dsa: add CONFIG_BRIDGE dependency Date: Mon, 13 Nov 2017 14:57:32 +0100 Message-Id: <20171113135756.3250298-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:zlLY7GPC+xzQnhc1d/lQ/OFDoiHuh4NuX7uui1pEephgCRu1wvl +hzwgFv9CP4+3/QiX0nZysVUUNNd+fjAknu3FtNBcuo5Z+zCtnkpnctX52m6RTQfEe3ZVg3 JeXtpH2OGVfp8ovqWCzuGees5+y9rQuz2cf7j5Ei3CSBur6MyXrOnrGsRM0HPSQ3hr5l1JC aEm8YTzlKjfQYl6U4NFYA== X-UI-Out-Filterresults: notjunk:1; V01:K0:iAEvbkdGb4c=:F+VjvW2yBlc72kGT5VFwT0 2W+l4gmDY6gctPG0GFUynCd75iInbB8XDRpXTTek2tZJVdk4dli9UIIt7/ps86Kgy31W8Wig2 9Kw6Ixfnge7iSAaNaoFipLYv/FYNLPCjQxvZmet461ta8oqjs7gESrP12HKm+fjvz9Myfc0Vk 4jUmxvHiInI4iWo4wPX/y/M57JTDO4JhILj2fvNljoIIDU9Fx/PMJra7qf8Nw6Vq68vvFhvBO VV/kin79p4FT3q2+19jmN7WlqtNULUiH7WXnNR+HFeyXEkA5Z3dhPGNdf2PwpQyyR50BZbLvi bY9hXc0Ikltw5h41pPSoeD31PD570undSGz7LhAAEotpFebJRu0w00B/PbKp/nHGy0HOeTgWT tLp2a5YjBKfOp0ARkY0EyS6x+iZYrV4X7bSHgGVSuUebDIBoM1JaKU5pKm+Rppum2mEfwv7Sn gZHcd7n62uxm0y+/yR0W6SQeBfQP9RP/t3JpXpFg1JHKawub9xImnDPDRBSEFiB1miyEyS75e rqlBelg+FPNY27XCJZ1abZLFbDlDE/mb3S8OQytsW+yBCKYhF3iTs2KnarWjRyK6Uko7b5RmV L91aigXyDhgHbGUDmiWIB11RDlx/zZnDXS/tAbpOrUCKCtQRFZ7SHKLc1FEk9E3D0xO0xGjFK Uxk7sVaGdOfLjL1p8qORK5VKrBIF9KmGeI3EzLEsnTTeCpio29LJE/kezr+Ku0OmvX6Eg+YVp 3vqpfnxIovUkdfUzaraM+qo/uJEWFG/selY71Q== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org br_vlan_enabled() may be provided by a loadable module, which causes a build error when called from a built-in function: net/dsa/port.o: In function `dsa_port_vlan_add': port.c:(.text+0x4a7): undefined reference to `br_vlan_enabled' net/dsa/port.o: In function `dsa_port_vlan_del': port.c:(.text+0x529): undefined reference to `br_vlan_enabled' This adds a Kconfig dependency to enforce NET_DSA to not be built-in when BRIDGE is a module and BRIDGE_VLAN_FILTERING is enabled. We can still build NET_DSA as built-in when the bridge code is completely disabled, or built-in, or a module without vlan filtering support. Fixes: 2ea7a679ca2a ("net: dsa: Don't add vlans when vlan filtering is disabled") Signed-off-by: Arnd Bergmann --- net/dsa/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index cc5f8f971689..15926d94d796 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -7,6 +7,7 @@ config HAVE_NET_DSA config NET_DSA tristate "Distributed Switch Architecture" depends on HAVE_NET_DSA && MAY_USE_DEVLINK + depends on BRIDGE || !BRIDGE_VLAN_FILTERING select NET_SWITCHDEV select PHYLIB ---help---