Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750880AbdHaEAC (ORCPT ); Thu, 31 Aug 2017 00:00:02 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:34691 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751001AbdHaEAA (ORCPT ); Thu, 31 Aug 2017 00:00:00 -0400 Date: Wed, 30 Aug 2017 20:59:55 -0700 User-Agent: K-9 Mail for Android In-Reply-To: <20170831033846.23538-1-sam@mendozajonas.com> References: <20170831033846.23538-1-sam@mendozajonas.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Subject: Re: [PATCH net-next] net/ncsi: Define {add,kill}_vid callbacks for !CONFIG_NET_NCSI To: Samuel Mendoza-Jonas , "David S . Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, OpenBMC Maillist CC: Joel Stanley , Benjamin Herrenschmidt , Gavin Shan From: Florian Fainelli Message-ID: <6D0042A3-C029-4CAC-86B1-F570E541D8C0@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id v7V408cS030827 Content-Length: 1502 Lines: 52 On August 30, 2017 8:38:46 PM PDT, Samuel Mendoza-Jonas wrote: >Patch "net/ncsi: Configure VLAN tag filter" defined two new callback >functions in include/net/ncsi.h, but neglected the !CONFIG_NET_NCSI >case. This can cause a build error if these are referenced elsewhere >without NCSI enabled, for example in ftgmac100: > >>>> ERROR: "ncsi_vlan_rx_kill_vid" >[drivers/net/ethernet/faraday/ftgmac100.ko] undefined! >>>> ERROR: "ncsi_vlan_rx_add_vid" >[drivers/net/ethernet/faraday/ftgmac100.ko] undefined! > >Add definitions for !CONFIG_NET_NCSI to bring it into line with the >rest >of ncsi.h > >Signed-off-by: Samuel Mendoza-Jonas >--- > include/net/ncsi.h | 8 ++++++++ > 1 file changed, 8 insertions(+) > >diff --git a/include/net/ncsi.h b/include/net/ncsi.h >index 1f96af46df49..2b13b6b91a4d 100644 >--- a/include/net/ncsi.h >+++ b/include/net/ncsi.h >@@ -36,6 +36,14 @@ int ncsi_start_dev(struct ncsi_dev *nd); > void ncsi_stop_dev(struct ncsi_dev *nd); > void ncsi_unregister_dev(struct ncsi_dev *nd); > #else /* !CONFIG_NET_NCSI */ >+int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 >vid) >+{ >+ return -ENOTTY; Returning -EOPNOTSUPP would probably be more correct here. >+} >+int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 >vid) >+{ >+ return -ENOTTY; Likewise. >+} >static inline struct ncsi_dev *ncsi_register_dev(struct net_device >*dev, > void (*notifier)(struct ncsi_dev *nd)) > { -- Florian