Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752577AbdHKG0p (ORCPT ); Fri, 11 Aug 2017 02:26:45 -0400 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:55765 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751359AbdHKG0H (ORCPT ); Fri, 11 Aug 2017 02:26:07 -0400 X-ME-Sender: X-Sasl-enc: y1cmsfXuUYcAF1wYcgTqPHS5/tHga2bd1tOtiF5ALfam 1502432225 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 , ratagupt@in.ibm.com Subject: [PATCH 1/3] ftgmac: Include NETIF_F_HW_VLAN_CTAG_FILTER in features Date: Fri, 11 Aug 2017 16:16:46 +1000 Message-Id: <20170811061648.19661-2-sam@mendozajonas.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170811061648.19661-1-sam@mendozajonas.com> References: <20170811061648.19661-1-sam@mendozajonas.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1058 Lines: 26 This is required for the VLAN core to call the add/kill callback for VLAN IDs. 'ftgmac100' already supports VLAN tagging but this flag lets the network stack know that we want to be notified of VLAN tags being added or removed when we have NCSI support. Signed-off-by: Samuel Mendoza-Jonas --- drivers/net/ethernet/faraday/ftgmac100.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 33b5c8eb9961..7c4d772287c7 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1837,6 +1837,9 @@ static int ftgmac100_probe(struct platform_device *pdev) NETIF_F_GRO | NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX; + if (priv->use_ncsi) + netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER; + /* AST2400 doesn't have working HW checksum generation */ if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac"))) netdev->hw_features &= ~NETIF_F_HW_CSUM; -- 2.14.0