From patchwork Tue Dec 11 17:25:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Didier Pallard X-Patchwork-Id: 48650 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 41E017CEB; Tue, 11 Dec 2018 18:25:31 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 7489E5F3B for ; Tue, 11 Dec 2018 18:25:28 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id j2so14977321wrw.1 for ; Tue, 11 Dec 2018 09:25:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=4kfPBnox+FJsO51c+1NinxOKpm+4URQNHV3I9xi6sHs=; b=P1hOzZe70wAO5USFON1aXIUHxIkS7AT/BIS+UWTYIGeflYFKBdnc9AKxJZ3G0BSxYg 46pHW5aY9Zusg6S7kk8Fh1IJ7u1pRhGGvN0UyZ2dJtjWY8QFt5sRfTxSfl7F42tiheur 3t5ZB4yoMmkam22GqyH297jiQlZNMfET4ka9GaO+R0O1Ee8z4aJ5ZZTnuO/1qgV5aP1C IhodTM+QoqVrKiRmYZaXdy0ah58k/Ju/tnHhczEnL8IQ2utKD7K+3oKwX3jhxS31v7+W 3a3ajEcGc7mJp/A+5Sb/+k52a7aXmC/Rc/YG2bQY3riCd6689rdQLH40SRhzmw6UX+LI iSYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4kfPBnox+FJsO51c+1NinxOKpm+4URQNHV3I9xi6sHs=; b=qxtz7306rfbahaeRbdv+S+aogBlFQjyreCcYkOjzNE0ZZFN1UNLfvOe45Q1FGnzbDQ SzxdKbYG7Bi8hX5+98gIR5hh7dBTa8Hjonl8tzmi4P/CyrY1O5LITOAkMCOAruvLPaoD ngZdAvBpn18kwS3QCnfr6bST0y5rWfDFwXIs4HveiHRkSDNTkhPhiC6fgynPQKBYdoIT ecG5IplyIM/vTAJYHQYZVF9/BrpzoHshcJ2s3txapaYNA4ZyDYvRm2bY6gOB2P/OsoYL X0PF62iQrzEcxYTtOm7Djws5xP3VcIN/fyUeLVfSVCPsb18KJ4+tFHkeRSmcjcu+B6kK sHvg== X-Gm-Message-State: AA+aEWb/5k0CHYpUHSY4jTvLTgihizlIyCvxk7VAhumDVh757iyea+6R BdSsif1k7kgF+OTTnP6s+VEtY9n7hGc= X-Google-Smtp-Source: AFSGD/U7bUdCgh2ksqrfSAE5gqs/BHI+XNxp0Ye6y3wlKzK+8V7YGKPIrpUZv03+BHXvuoU6R7Dy6g== X-Received: by 2002:adf:b783:: with SMTP id s3mr15093447wre.274.1544549127848; Tue, 11 Dec 2018 09:25:27 -0800 (PST) Received: from pala.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id w6sm617836wme.46.2018.12.11.09.25.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 09:25:27 -0800 (PST) From: Didier Pallard To: dev@dpdk.org Cc: stable@dpdk.org Date: Tue, 11 Dec 2018 18:25:01 +0100 Message-Id: <20181211172501.31467-1-didier.pallard@6wind.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH] net/i40e: revert fix offload not supported mask X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This reverts commit 09a62d75691f ("net/i40e: fix offload not supported mask") Contrary to what is said in above patch commit log, I40E_TX_OFFLOAD_NOTSUP_MASK is the mask of Tx offload bits that are part of PKT_TX_OFFLOAD_MASK but not included in I40E_TX_OFFLOAD_MASK. Above patch erroneously includes all PKT_RX_OFFLOAD_ bits in the I40E_TX_OFFLOAD_NOTSUP_MASK, this is not what is expected. Restore the initial xor that gives the expected result. Fixes: 09a62d75691f ("net/i40e: fix offload not supported mask") Cc: stable@dpdk.org Signed-off-by: Didier Pallard Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index e1152ff0ea58..ab74a488f88b 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -69,7 +69,7 @@ I40E_TX_IEEE1588_TMST) #define I40E_TX_OFFLOAD_NOTSUP_MASK \ - ~(PKT_TX_OFFLOAD_MASK & I40E_TX_OFFLOAD_MASK) + (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK) static inline void i40e_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union i40e_rx_desc *rxdp)