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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 62D79C282CE for ; Wed, 22 May 2019 20:03:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D15B20863 for ; Wed, 22 May 2019 20:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558555386; bh=eykYNv6pdyHVJDIhpL5jl/+NPZPjsRX9ZsWonZ/WAVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SZU4j5xopJWwz/ilXz6jjd1aIAUylcet8eQqE9DVinBwCfvYyBvd1Jtb8euCe1X/J DaSUhXAZ3x8nDtbaZu7wd18TsbUJjvzrOkVZEtoXX8hGCLbKnuH6NsWLJm6nLt6sBa d3zqm+mUEh6ACy9BzfgxOC7KXm1o0KKmzHS/aNMY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730080AbfEVTVq (ORCPT ); Wed, 22 May 2019 15:21:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:42282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730027AbfEVTVk (ORCPT ); Wed, 22 May 2019 15:21:40 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 671ED2177E; Wed, 22 May 2019 19:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558552900; bh=eykYNv6pdyHVJDIhpL5jl/+NPZPjsRX9ZsWonZ/WAVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hI9jma/XAUPPHLgo4yfxUsIntTtSC1WCsywj+Vlw5D0YNA9U+ZAc5JUxUEISrVG5M u/Ff/0IPwqthoRjzZ25iqjSOCUXwtNo9UNmmdtibFclqsXAlCL3wkGdjIj40v+JD2T XYdjwFmhYy6m/lYSb1kkt7PeVdHtv+hMhENFAKJ8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tony Nguyen , Anirudh Venkataramanan , Andrew Bowers , Jeff Kirsher , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 018/375] ice: Preserve VLAN Rx stripping settings Date: Wed, 22 May 2019 15:15:18 -0400 Message-Id: <20190522192115.22666-18-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522192115.22666-1-sashal@kernel.org> References: <20190522192115.22666-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tony Nguyen [ Upstream commit e80e76db6c5bbc7a8f8512f3dc630a2170745b0b ] When Tx insertion is set, we are not accounting for the state of Rx stripping. This causes Rx stripping to be enabled any time Tx insertion is changed, even when it's supposed to be disabled. Signed-off-by: Tony Nguyen Signed-off-by: Anirudh Venkataramanan Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_lib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index fa61203bee269..b710545cf7d1a 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -1848,6 +1848,10 @@ int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi) */ ctxt->info.vlan_flags = ICE_AQ_VSI_VLAN_MODE_ALL; + /* Preserve existing VLAN strip setting */ + ctxt->info.vlan_flags |= (vsi->info.vlan_flags & + ICE_AQ_VSI_VLAN_EMOD_M); + ctxt->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID); status = ice_update_vsi(hw, vsi->idx, ctxt, NULL); -- 2.20.1