{"id":809983,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809983/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170905080615.1131665-1-arnd@arndb.de/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170905080615.1131665-1-arnd@arndb.de>","list_archive_url":null,"date":"2017-09-05T08:05:47","name":"net/ncsi: fix ncsi_vlan_rx_{add,kill}_vid references","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"9ad7cd694154d5891db06bcea4f6f4f1a5e167a9","submitter":{"id":30,"url":"http://patchwork.ozlabs.org/api/1.2/people/30/?format=json","name":"Arnd Bergmann","email":"arnd@arndb.de"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170905080615.1131665-1-arnd@arndb.de/mbox/","series":[{"id":1505,"url":"http://patchwork.ozlabs.org/api/1.2/series/1505/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1505","date":"2017-09-05T08:05:47","name":"net/ncsi: fix ncsi_vlan_rx_{add,kill}_vid references","version":1,"mbox":"http://patchwork.ozlabs.org/series/1505/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809983/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809983/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmfSW629Jz9s7c\n\tfor ;\n\tTue, 5 Sep 2017 18:06:51 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1750984AbdIEIGe (ORCPT );\n\tTue, 5 Sep 2017 04:06:34 -0400","from mout.kundenserver.de ([212.227.126.130]:52981 \"EHLO\n\tmout.kundenserver.de\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750814AbdIEIGb (ORCPT\n\t); Tue, 5 Sep 2017 04:06:31 -0400","from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de\n\t(mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id\n\t0MBX2g-1dejGv1xDS-00AVwt; Tue, 05 Sep 2017 10:06:19 +0200"],"From":"Arnd Bergmann ","To":"\"David S. Miller\" ,\n\tGavin Shan ,\n\tSamuel Mendoza-Jonas ","Cc":"Arnd Bergmann , Joel Stanley ,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","Subject":"[PATCH] net/ncsi: fix ncsi_vlan_rx_{add,kill}_vid references","Date":"Tue, 5 Sep 2017 10:05:47 +0200","Message-Id":"<20170905080615.1131665-1-arnd@arndb.de>","X-Mailer":"git-send-email 2.9.0","X-Provags-ID":"V03:K0:yqACGSiIWnJci8Rp6S3BLypM3g1ayLntfV3xK0ZIXTW2bEJyVT3\n\tWqNongs0OBBq+mMUUYWTbc+DVGB5xS2PYX4ZJWupghqtrC6oKXZZxRQ2rxZLTM8U0EX9xfd\n\t4d332odvXL7GdYdDul/yGi0O3CI7rYkof9uhVbPJJmqBvMWnvDOSDvoXLf+w27/Zzi+YFWN\n\t5WU5JawmWwb3uYVSLAc0A==","X-UI-Out-Filterresults":"notjunk:1; V01:K0:Q15SxZLo8gM=:IivaR3gcnXq3Xza8EGOVx9\n\t992mjTuOLqNYmn74HsSjMqKLqC7hwcebj0Kv2JDbrJs32Mff1kxnhKm6SbQ3hDBKrszGngRAm\n\t5cQEDGR+u4uhWjsx97YUUThe3w0fdzZsBGP2hemyb8JvLKS/fp6VDAuH+NNPqGoEYDQCzvy+2\n\tuDN002YJ13l3sgxGB57vL2/GyirQIFaj3Hd3QZiwo4iQyU3Iwns+EXykxLWn/4hQwupnOFs+4\n\t8R7CkICKc6O8GZxwOfHf4ccX8eA1ofe/qW4nMtooyGZgp9cNkXOyhG2DJoY8pzvNPQ18nD71V\n\tUNzMLIN2X5N0DiuB7Sl/bHrMo1heleBdW53qfOxUelghMMzNuxpyoT5bZv2C21Tuy+RR2AI29\n\txyhZBKAj87NPbDJrqtd636x9/FgDykgpMvD58fraPGvHv3gvIZEh+83O7puVa6HhTxUse1bF0\n\tFuTVWboib242WmgkTq0NkQcW5fPjva+AEtNsjgqGpJ4H1mKVWBxMhLYaETuL2GjY37zfAIhU6\n\tQ92n2W9eCkFP2bnlUooY3lgS0HJB+gsNczfP5O5GJsC0zi273whtPZDZAX7QwhsZQ1pu9JkWp\n\t+ZveJZR3mJZU03PhdbmPrKD8RSzYmWSjAHOM8rKo2trStNXwOiQiqNS/aTRcdKTt4sZog5z4d\n\t3lb9XOuCGUY4eoVrsl78f014m7Z/BRwiEhGWs3iy0R1wi+xgsfAOrO6kNtB3ku2SLywJe6CVP\n\tMK5Exskk7OvyXyAIv59dFwYqSneZMhwl8G0MPg==","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"We get a new link error in allmodconfig kernels after ftgmac100\nstarted using the ncsi helpers:\n\nERROR: \"ncsi_vlan_rx_kill_vid\" [drivers/net/ethernet/faraday/ftgmac100.ko] undefined!\nERROR: \"ncsi_vlan_rx_add_vid\" [drivers/net/ethernet/faraday/ftgmac100.ko] undefined!\n\nRelated to that, we get another error when CONFIG_NET_NCSI is disabled:\n\ndrivers/net/ethernet/faraday/ftgmac100.c:1626:25: error: 'ncsi_vlan_rx_add_vid' undeclared here (not in a function); did you mean 'ncsi_start_dev'?\ndrivers/net/ethernet/faraday/ftgmac100.c:1627:26: error: 'ncsi_vlan_rx_kill_vid' undeclared here (not in a function); did you mean 'ncsi_vlan_rx_add_vid'?\n\nThis fixes both problems at once, using a 'static inline' stub helper\nfor the disabled case, and exporting the functions when they are present.\n\nFixes: 51564585d8c6 (\"ftgmac100: Support NCSI VLAN filtering when available\")\nFixes: 21acf63013ed (\"net/ncsi: Configure VLAN tag filter\")\nSigned-off-by: Arnd Bergmann \n---\n include/net/ncsi.h | 10 ++++++++++\n net/ncsi/ncsi-manage.c | 2 ++\n 2 files changed, 12 insertions(+)","diff":"diff --git a/include/net/ncsi.h b/include/net/ncsi.h\nindex 1f96af46df49..fdc60ff2511d 100644\n--- a/include/net/ncsi.h\n+++ b/include/net/ncsi.h\n@@ -36,6 +36,16 @@ int ncsi_start_dev(struct ncsi_dev *nd);\n void ncsi_stop_dev(struct ncsi_dev *nd);\n void ncsi_unregister_dev(struct ncsi_dev *nd);\n #else /* !CONFIG_NET_NCSI */\n+static inline int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)\n+{\n+\treturn -EINVAL;\n+}\n+\n+static inline int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)\n+{\n+\treturn -EINVAL;\n+}\n+\n static inline struct ncsi_dev *ncsi_register_dev(struct net_device *dev,\n \t\t\t\t\tvoid (*notifier)(struct ncsi_dev *nd))\n {\ndiff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c\nindex 11904b3b702d..3fd3c39e6278 100644\n--- a/net/ncsi/ncsi-manage.c\n+++ b/net/ncsi/ncsi-manage.c\n@@ -1453,6 +1453,7 @@ int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)\n \n \treturn found ? ncsi_process_next_channel(ndp) : 0;\n }\n+EXPORT_SYMBOL_GPL(ncsi_vlan_rx_add_vid);\n \n int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)\n {\n@@ -1491,6 +1492,7 @@ int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)\n \n \treturn found ? ncsi_process_next_channel(ndp) : 0;\n }\n+EXPORT_SYMBOL_GPL(ncsi_vlan_rx_kill_vid);\n \n struct ncsi_dev *ncsi_register_dev(struct net_device *dev,\n \t\t\t\t void (*handler)(struct ncsi_dev *ndev))\n","prefixes":[]}