From patchwork Wed May 31 08:16:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100737 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp216295qge; Wed, 31 May 2017 01:23:10 -0700 (PDT) X-Received: by 10.99.137.198 with SMTP id v189mr30709535pgd.205.1496218990698; Wed, 31 May 2017 01:23:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496218990; cv=none; d=google.com; s=arc-20160816; b=TckElUaA7iv8p2RrtaXZYTUPkokpScLu9fx2nLDFRNsuiAEdqiTtcoGl/77cIBVpq8 Pnub0UX+JK/JCAcf6qWCmwzgBNrJ5XHQtnyJI+qJrDsJhqtbkZh7gTVk2JlMVbYQaN3G 9ODaxFknRqcRLUxlIdbqOFT4KI8GNIgK5hQ1fJjlSS/3n8aK9CDidG+bKJicFajM4FSK 74PUWmkmWtfYBFTIVnyBQqGiqqKmZ9BDhCPYv7zz6pEuuCoSWM2wTxS7irVIwVw8BMR3 z/cYEOR1TZ0dMiz62HvwwFU7FoD04V0kWG+ZjDQiC4wGRufSFpzUhC4wQkSqdtnyj9yf sCHA== 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=KvQDI/HSBo7u53F231JLEPYduJOmbL635DL3XNVjL/U=; b=IP9d7f+3wgQ/ONlQWarjTFi6FEVbf7NOWSB50N8bB9cjRC2tKgwRfD82wsVULzahY5 LMpIEOCrLjhytymfS45i4j5VvcrxebFPUnxbFptSsb5hntik2aIML2X8kCrXJynbzIry jZo5i8Ag19mEMSFsYzFJI/iGnVdC+U7l9n8DI9whhis6DhlRA9MpfCOcQfNYRdNCMH2J yxP/XCLjwuNXQqUpxegD49W3+KZYRS2dyX4UvcjntNSabdiga1VTwRIAZ7FJzpd1ftEZ yC/WPBggEU/iRXNkWZ6rnOlF3kmUt5bof9n3/1OQ+KjdSqAP/v+5CuYhP3dbs81LpVCo y10g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-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 t19si16112054pgj.263.2017.05.31.01.23.10; Wed, 31 May 2017 01:23:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-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 netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751448AbdEaIXE (ORCPT + 6 others); Wed, 31 May 2017 04:23:04 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60311 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751412AbdEaIRY (ORCPT ); Wed, 31 May 2017 04:17:24 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MFKXk-1dAQNw0RNs-00EMaj; Wed, 31 May 2017 10:17:04 +0200 From: Arnd Bergmann To: Jakub Kicinski Cc: Simon Horman , Arnd Bergmann , "David S. Miller" , oss-drivers@netronome.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] nfp: add MAY_USE_DEVLINK dependency Date: Wed, 31 May 2017 10:16:50 +0200 Message-Id: <20170531081700.1948289-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:NfVtxVFKTTQ98P4U6gdY6VXNU8T1ANjYfVdZDz66MvhKa2hxrmJ vXUh79MxnfNicog0n4CSjvZ5Db3SdmnwTNY0FjXMDpdZrEPb5TdX6CNU5RclPIC2V2gcqrK +k6M2WrUckRjyef5vSFJG/TMMEsTqwqa41GYPXPbel5ZxQOdR6yl+wYheq/Sqr+hJ69OVyy I9nH5PJap+Ivrtanc4GBQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:VQ1S9jc8+y4=:SX1lfmfuUJsdsY4IAE+6Pn IaPss5BI1Gpu37+2TPJ9E1ww+TbWvJQIOtRA2smYhzx64kc3SASqwdIgIXIF6EsIzikceWq0s 11fvnHmFFOUZvqIbp34E3x3NgemeB4zafimyIIGMrO2VrO9BL47Hn7wyc/TklPBuge1YFJ6cT RTaeXO5UfEjjMsbD/3C4DvMxrQadILqCvJ06NPLRu/4aDsrExKplX2tO7wxP0DF51+w/PQcUs g4oXyhXGZakT8mIb9umfnVyOPF093awusK6IW0opBCumpYBXYWka7toikUwXbTwjvgzyRi0Sb gOCM9Cnlau++Z9J2ATp97SmyRIjkl1/4PoCqpa0bVqb+/YS4GKGUZa7xSSoykQ7JqZ2CVLx5q pKf1dOjxbpV+aoLsnngCtFlsS82wL/9hwMTVqACHuHMe6XQ79jhO40oqi9CMCkN5HG9cqS6/b mC8lsMQM4bpHCmBuSdEneeBjp4YVCgoC+agTHzmQPgFzz+9GiOtdGUijNIVU9SGyb+aNdrc93 8PvPuOKpWV7OKyGxZRaW+9Qob0aLhrFCdOLeV7YOlR8Cd2wsnuii5XAFRaYdIkw5mbWGzv6hD d468oQBDsjlpEbup9ElIk/rrxQpK6O84Rma/yVR+wNL9EZdBRhipnw/PFzIKmYvMBQg1nwSHf 2Du7Ql4i1VVrDiiirygd1PssuEhiyFvRFi5+B4FpYxz5JIJaMMfqbq2Yp1UOt6qYwzeo= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When devlink is configured as a loadable module, a built-in nfp driver causes a link error: drivers/net/built-in.o: In function `nfp_devlink_port_register': (.text+0xb8b05): undefined reference to `devlink_port_type_eth_set' drivers/net/built-in.o: In function `nfp_devlink_port_register': (.text+0xb8b16): undefined reference to `devlink_port_split_set' This adds a special Kconfig dependency on CONFIG_MAY_USE_DEVLINK to avoid that combination and force nfp to be a module when NET_DEVLINK=m. Fixes: 1851f93fd2ee ("nfp: add devlink support") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/netronome/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/drivers/net/ethernet/netronome/Kconfig b/drivers/net/ethernet/netronome/Kconfig index 967d7ca8c28c..0d5a7b9203a4 100644 --- a/drivers/net/ethernet/netronome/Kconfig +++ b/drivers/net/ethernet/netronome/Kconfig @@ -19,6 +19,7 @@ config NFP tristate "Netronome(R) NFP4000/NFP6000 NIC driver" depends on PCI && PCI_MSI depends on VXLAN || VXLAN=n + depends on MAY_USE_DEVLINK ---help--- This driver supports the Netronome(R) NFP4000/NFP6000 based cards working as a advanced Ethernet NIC. It works with both