Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751332AbdHaDi4 (ORCPT ); Wed, 30 Aug 2017 23:38:56 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:59659 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750822AbdHaDiy (ORCPT ); Wed, 30 Aug 2017 23:38:54 -0400 X-ME-Sender: X-Sasl-enc: y3pcSWo2N44HlpTsdsYWbj6RazPd5ZOtrQJ18+3O8aiO 1504150733 From: Samuel Mendoza-Jonas To: "David S . Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, OpenBMC Maillist Cc: Samuel Mendoza-Jonas , Joel Stanley , Benjamin Herrenschmidt , Gavin Shan Subject: [PATCH net-next] net/ncsi: Define {add,kill}_vid callbacks for !CONFIG_NET_NCSI Date: Thu, 31 Aug 2017 13:38:46 +1000 Message-Id: <20170831033846.23538-1-sam@mendozajonas.com> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1300 Lines: 37 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; +} +int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid) +{ + return -ENOTTY; +} static inline struct ncsi_dev *ncsi_register_dev(struct net_device *dev, void (*notifier)(struct ncsi_dev *nd)) { -- 2.14.1