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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 3C54FC432C0 for ; Tue, 19 Nov 2019 05:26:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0ED3D222DF for ; Tue, 19 Nov 2019 05:26:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141218; bh=FBFUnT8LQXED72+Al9YJaWDfbqJLi+M8khoAEx+dqV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cA75poYgFRRlQuROVHotoGmBmXgCg9D8owE4l4LlCVggcT2xv/CUgT0UrGTd+BO8O eq0svX/8OmZMbYwVeuIX+w7INgyAqNff2JBG6kSCMOGFAOHLzgkKRkRR/0Az5/BQJe jHVxJ/JCP96+NeV62xjSLK6EAQDQrW3y+rYENb8I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728659AbfKSF04 (ORCPT ); Tue, 19 Nov 2019 00:26:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:45032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728636AbfKSF0x (ORCPT ); Tue, 19 Nov 2019 00:26:53 -0500 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 0416D21783; Tue, 19 Nov 2019 05:26:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141212; bh=FBFUnT8LQXED72+Al9YJaWDfbqJLi+M8khoAEx+dqV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UhG6GQnz+SIKWKjvi/XIEQ9ORO+HBefxJTwMjA/hdvz/VMa0XrkPj0G+zK0F2SlT+ mlKp2cFpbYzUHvSDMVXcbC/R7LvxcmqLfViT46JbXK91dYydF1RZ2U6+976EjFh5hM wII0l1wt5lGOFKgHNeX5tgZ6TR5j3uDV29w0UG0k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Patryk=20Ma=C5=82ek?= , Andrew Bowers , Jeff Kirsher , Sasha Levin Subject: [PATCH 4.19 082/422] i40evf: Dont enable vlan stripping when rx offload is turned on Date: Tue, 19 Nov 2019 06:14:39 +0100 Message-Id: <20191119051404.785783726@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Patryk Małek [ Upstream commit 3bd77e2ae1477d6f87fc3f542c737119d5decf9f ] With current implementation of i40evf_set_features when user sets any offload via ethtool we set I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING as a required aq which triggers driver to call i40evf_enable_vlan_stripping. This shouldn't take place. This patches fixes it by setting the flag only when VLAN offload is turned on. Signed-off-by: Patryk Małek Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index bc4fa9df6da3e..3fc46d2adc087 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c @@ -3097,18 +3097,19 @@ static int i40evf_set_features(struct net_device *netdev, { struct i40evf_adapter *adapter = netdev_priv(netdev); - /* Don't allow changing VLAN_RX flag when VLAN is set for VF - * and return an error in this case + /* Don't allow changing VLAN_RX flag when adapter is not capable + * of VLAN offload */ - if (VLAN_ALLOWED(adapter)) { + if (!VLAN_ALLOWED(adapter)) { + if ((netdev->features ^ features) & NETIF_F_HW_VLAN_CTAG_RX) + return -EINVAL; + } else if ((netdev->features ^ features) & NETIF_F_HW_VLAN_CTAG_RX) { if (features & NETIF_F_HW_VLAN_CTAG_RX) adapter->aq_required |= I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING; else adapter->aq_required |= I40EVF_FLAG_AQ_DISABLE_VLAN_STRIPPING; - } else if ((netdev->features ^ features) & NETIF_F_HW_VLAN_CTAG_RX) { - return -EINVAL; } return 0; -- 2.20.1