From patchwork Thu Aug 31 03:38:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 807999 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="pWGbfMK4"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="VYKFKdiD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xjSlx3vh7z9sNr for ; Thu, 31 Aug 2017 13:39:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751284AbdHaDi4 (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 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 2C40121B9C; Wed, 30 Aug 2017 23:38:54 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute2.internal (MEProxy); Wed, 30 Aug 2017 23:38:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=JXJECG 3H6ciM/5gVUYz80mVFOrhDE0+4TToYiQcz0Ao=; b=pWGbfMK46l3uXGQseLWelm 5oCyKXvQpZfpk1/7voYl5sC+cPraf/fbK4o8sfleRNaROLJ4TXS2Y48+KLKCWNb0 14XroXgJccg/fkG1xaKYZbL42YrJ0uYNt0VmvI1Y2hhES7UFBp9WCLmqxVu/qKyJ L69yQJunk3EI8XdpJ3192ctpqGRicVJdwlkkAKrW+wIPsP9Nqsc5OKs8iad3EOkO fq4LjIakmJspceVparMZ1eH0pdMz//f19qJ4+2mFpgzKu+NdSa0EeViXVm8gjqAT UJIkVOYEPgZ+ZbHKl+HrSswXY+5JdCs2u5mPJDyWCl+ZC1LTnBthC0rlOjYHJFBQ == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=JXJECG 3H6ciM/5gVUYz80mVFOrhDE0+4TToYiQcz0Ao=; b=VYKFKdiDZgVaNcY3fxwX7v zaSmkN6Z8QU7u20EDFnhAhgPv9IsquvzT9gN1+sJhCmQdgGShR6qvyD7VuVdqj/p e60tLmP97WnBBdibN0qo3238uzaBltJM0YFP5NLTSsXxOYrbEEPcKVQ+AxDjqem6 YF6ujMdqTQ/aSzYwhnHxAxdkfkKdv1IIdbMZ3+ylJmAc0I7+FcixHlpOdqi+7r/8 crErG75xI8Gk8RYs3toPSf4Gt5cUBIjush+1pDEFDZx4EU8+OZd0N9JWOGClExQI o7R7qrh+R0dqbItoh2EUFdeYXkKspz6hOBUR1AuGEWhAygE+FBbBvaGdRjPqrGdQ == X-ME-Sender: X-Sasl-enc: y3pcSWo2N44HlpTsdsYWbj6RazPd5ZOtrQJ18+3O8aiO 1504150733 Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 9443724253; Wed, 30 Aug 2017 23:38:51 -0400 (EDT) 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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)) {