Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4573235pxv; Tue, 6 Jul 2021 04:23:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyj7mOqcCpMzaokaHRPrP0VK3ySyjsbbYB+34mx5LnID+FNTtUL0o6SZaidaGPaWlc/eTik X-Received: by 2002:a92:bd06:: with SMTP id c6mr13915448ile.110.1625570607592; Tue, 06 Jul 2021 04:23:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570607; cv=none; d=google.com; s=arc-20160816; b=wetU+oTWNL/RGYIiYYOGpxVxzXMzHyuA7MvZtZr9dDu15uSpMk527z0pgUYx4hMtOM uwddIdGwhJOqUzZoWCjc/upXUyrTjiCpOcySCJ1gIVx2OwiMjXSPTuTHWcRUhiE9g3m/ j+pf6Jor6bdC/xCd9suavIEDSfvtJB0Aaev3ZBvC12HCCW4dWzAMx3yG1GSNDXsWM/8I RBTnzi7fZkf52o9nQTxgV+NEz5coTc58i732Kn93rJfsBOM1guIlUuIScrSe4ET2+BSF T60O2hwyWrWLYeqxsws6IxOAm7nUVBEfn5rOm0hQ3tYsk/jsU8dVGVg8mCcP6NkSR0E+ h9HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=D5/02VMgUsBcnyx2ZMm77lJsB7ZCIoh4eDU2zBJZJws=; b=aSDa0fMPZ3WTUBNF0jUTxdRPk7bC+B/guohPUFKhO28fprTLLi3S5blTKuZjgYeobE GAATEwyY2l6TPMPc9Xu+FjqAEIKqBEz28UAVrR5E1QlYFZvk2+2z+ug/uN1ATqbEEACE aXTikYSOyJr1+O6qbrO5wxgTyAE6PFbaLwsHGqzaA9g4ZnS7nLsqDW4jf0CwNs0dAYkv gPzPPfShybSgC3SEZ1i9d8G41p7n0pmrrdKjzkdOW9d83IfJpdiyZk25PJrlsDEj6vOm z8EvcbRfOCqhsPxL5cdzCHTXHqX6UOXGejfJCvzFkK+ZJYhu0spN0ml8rQQIW/BUB1fy Zy5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Tl3ItFtq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f10si12295848jar.27.2021.07.06.04.23.15; Tue, 06 Jul 2021 04:23:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Tl3ItFtq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232597AbhGFLZ0 (ORCPT + 99 others); Tue, 6 Jul 2021 07:25:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:56556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232923AbhGFLT3 (ORCPT ); Tue, 6 Jul 2021 07:19:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 43B2361C43; Tue, 6 Jul 2021 11:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570211; bh=jm0JWmxGcpKQuILz7gY4zT/faOtsrR7J5SxL68SHXzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tl3ItFtqmu5JIzHcu8JBzWg5GgUfFtaxCFZ94J9oRLOMGJoaSs4PVfcedQbNfa5Gy 8JZRxi5VLiWi9Y5+J9EfnoM5ysGbzeNjwD7ovQolLdZSsh/GZ33GtEkVxSHoTMSbiS FtHovrjaVyRvYIf3u9Si72hyOe+WWNo2N8jxqyexkJMy3kCQ1iolLa5gdtFBoYX2E9 EwHkqTc3SUqB9+7KCrjFBiAUEfJj87nJxCpIhxUQ5fCTRuJ6O35zcX02vW4b+NbYbe 3Z0gdTxpf/DR1OJ3gScxCzf9/DJ8Szw3iDI4lRV422uCq9nDBATOelIClFE+X2TxXB U0odh7LMGVF2Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jacob Keller , Tony Brelinski , Tony Nguyen , Sasha Levin , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 120/189] ice: fix incorrect payload indicator on PTYPE Date: Tue, 6 Jul 2021 07:13:00 -0400 Message-Id: <20210706111409.2058071-120-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jacob Keller [ Upstream commit 638a0c8c8861cb8a3b54203e632ea5dcc23d8ca5 ] The entry for PTYPE 90 indicates that the payload is layer 3. This does not match the specification in the datasheet which indicates the packet is a MAC, IPv6, UDP packet, with a payload in layer 4. Fix the lookup table to match the data sheet. Signed-off-by: Jacob Keller Tested-by: Tony Brelinski Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h index 21329ed3087e..fc3b56c13786 100644 --- a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h +++ b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h @@ -744,7 +744,7 @@ static const struct ice_rx_ptype_decoded ice_ptype_lkup[] = { /* Non Tunneled IPv6 */ ICE_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3), ICE_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3), - ICE_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY3), + ICE_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY4), ICE_PTT_UNUSED_ENTRY(91), ICE_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP, PAY4), ICE_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4), -- 2.30.2