Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp850864yba; Wed, 24 Apr 2019 10:36:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyFO73zMZO2H/6kuPqFM+AGTyDAbiSRykAcu6v1QGlSrzLQPwVk3ZAB2nmIwymTYt7C0FN7 X-Received: by 2002:a17:902:8d97:: with SMTP id v23mr33586886plo.298.1556127397819; Wed, 24 Apr 2019 10:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556127397; cv=none; d=google.com; s=arc-20160816; b=S+moo66OfM1VnP8Dv74YhgzeZAVEiWJ6WjLydXJ9pWe2di6b3XcJMqEXJ9Pb+MxOV7 kM55etJLEhMECjFrWsLXBrzC0Cc/RGe3Tmdg6O0NyWsa2LOsAvWQZ5JILClREkHq76Bk Nxbr720gEPdwRCbODeM/A2M4hm736YHH23S3gAokRuSoRYuXP44LO/WMIpPClb2gEEzb /bleVbxLVEGyIv19A0xcRP+LQiDibBACr+tJZoiWBpIhoJmVSo5VKcBagz2U7A8tPVuQ Dyt8+n9CBDhRjJLz+JZ5Td5owDg5ryvKgV07lPPWWv1nS1Xp8OWeabO0C3joFgAgWDRB xClA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=X+86w8nFMoQTaT4t41NjMzjJ1D1NvA7o5Epr3JBMDOU=; b=Bz/N+zcvEE7r+H/NK+ZADNr+0ogkchXjBgFPnckC7hmXD3nUVclMwfRO/TQwTquRqb rkoYjpJg4rMz58Aqezx5a4g99hOCsm3Xd9veF43+0MCjALdbWaqXxgc5/0tVlLgnRcTq 2x5WkeCFfoHmozu4I6iv2RYEpKmXd2lAt6XVpVPpqsIjGFaYSJo4zxCTJ9+Azphm3uF7 qtLT0DL//MO6xzGiPSAGDl72QBJQnh/piUQ4peoePQcKDlLk4I+DWSnSgMSAf/K/wgAk cMwgoa3Xm63r88Afi8ygcPonT7HJXxD0E50deYdkAy0CYw0L5Lof4HlATvwaO4lsSK4+ +zbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=noO3+xw3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a11si17713538pgw.384.2019.04.24.10.36.21; Wed, 24 Apr 2019 10:36:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=noO3+xw3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391801AbfDXRe4 (ORCPT + 99 others); Wed, 24 Apr 2019 13:34:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:33714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391792AbfDXRev (ORCPT ); Wed, 24 Apr 2019 13:34:51 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 4E8C620675; Wed, 24 Apr 2019 17:34:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127290; bh=lRNicWx/Uz7zAMl8+MOlL3C05SO32p52CYlCS9iOsrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=noO3+xw3n1hnD0+w5EIq55Hji2inSPwXiQw9AjHG2lIA6sWRExr8sl84VBqKtfi/r ep0xa9BVH4UexqWLh3ORKKBkvmeV/Okbi3ZlpOYraVdKFDnngmH76xqdBHpTAhKHiA jQKjEN5SVKvU2TcJk4vQbZW2UFgcO+xeGtVHDk6A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pieter Jansen van Vuuren , Louis Peens Subject: [PATCH 5.0 038/115] nfp: flower: remove vlan CFI bit from push vlan action Date: Wed, 24 Apr 2019 19:09:34 +0200 Message-Id: <20190424170927.283891881@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170924.797924502@linuxfoundation.org> References: <20190424170924.797924502@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: Pieter Jansen van Vuuren [ Upstream commit 42cd5484a22f1a1b947e21e2af65fa7dab09d017 ] We no longer set CFI when pushing vlan tags, therefore we remove the CFI bit from push vlan. Fixes: 1a1e586f54bf ("nfp: add basic action capabilities to flower offloads") Signed-off-by: Pieter Jansen van Vuuren Signed-off-by: Louis Peens Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/netronome/nfp/flower/action.c | 3 +-- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) --- a/drivers/net/ethernet/netronome/nfp/flower/action.c +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c @@ -49,8 +49,7 @@ nfp_fl_push_vlan(struct nfp_fl_push_vlan tmp_push_vlan_tci = FIELD_PREP(NFP_FL_PUSH_VLAN_PRIO, tcf_vlan_push_prio(action)) | - FIELD_PREP(NFP_FL_PUSH_VLAN_VID, tcf_vlan_push_vid(action)) | - NFP_FL_PUSH_VLAN_CFI; + FIELD_PREP(NFP_FL_PUSH_VLAN_VID, tcf_vlan_push_vid(action)); push_vlan->vlan_tci = cpu_to_be16(tmp_push_vlan_tci); } --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h @@ -82,7 +82,6 @@ #define NFP_FL_OUT_FLAGS_TYPE_IDX GENMASK(2, 0) #define NFP_FL_PUSH_VLAN_PRIO GENMASK(15, 13) -#define NFP_FL_PUSH_VLAN_CFI BIT(12) #define NFP_FL_PUSH_VLAN_VID GENMASK(11, 0) #define IPV6_FLOW_LABEL_MASK cpu_to_be32(0x000fffff)