From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5A34C433EC for ; Mon, 20 Jul 2020 16:05:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 987E22065E for ; Mon, 20 Jul 2020 16:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261120; bh=eBe0QDJL2Y0eDA0AKKFsk8hilV+Ik/d9FRnP60tpqNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=myVyTgRBdPF+nOjDXRQ0whJdqNSoEwNZqKejDZMvWKgaP/FyW3VKbFJOLToawzvDt RmU0b+vCv3ukmA530dMKZPwAZdz0do1Pif7LoX0DP1fJ+XaUnUppPtWrwV75zWdUlG B0AVoN4ErFhn1gTRo/hZHREK4GZZFo3oH+8/y5UY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732961AbgGTQFU (ORCPT ); Mon, 20 Jul 2020 12:05:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:40378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732520AbgGTQFH (ORCPT ); Mon, 20 Jul 2020 12:05:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3C7FE22CF7; Mon, 20 Jul 2020 16:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261106; bh=eBe0QDJL2Y0eDA0AKKFsk8hilV+Ik/d9FRnP60tpqNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RSBuiD095JJfsddmkmgpHHmDJPzNyejJqsJ0e2mAEwlcPC2FZ4Jc53YxXkJx+0LyU VlYejoet7wyopVYvVpXcj049VViAkFVPZVkHiGXlm7csEYNAyghNrLQYrbscCFsx6p NUBN8Zd9SF03EfoB0atGL42t9o/k/VYC8dyYIEYY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shannon Nelson , Jonathan Toppins , "David S. Miller" Subject: [PATCH 5.4 212/215] ionic: export features for vlans to use Date: Mon, 20 Jul 2020 17:38:14 +0200 Message-Id: <20200720152830.232717027@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shannon Nelson commit ef7232da6bcd4294cbb2d424bc35885721570f01 upstream. Set up vlan_features for use by any vlans above us. Fixes: beead698b173 ("ionic: Add the basic NDO callbacks for netdev support") Signed-off-by: Shannon Nelson Acked-by: Jonathan Toppins Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -1187,6 +1187,7 @@ static int ionic_init_nic_features(struc netdev->hw_features |= netdev->hw_enc_features; netdev->features |= netdev->hw_features; + netdev->vlan_features |= netdev->features & ~NETIF_F_VLAN_FEATURES; netdev->priv_flags |= IFF_UNICAST_FLT;