diff mbox series

[5.10,086/215] ice: mark PTYPE 2 as reserved

Message ID	20210715182614.607567535@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Jacob Keller <jacob.e.keller@intel.com>, Tony Brelinski <tonyx.brelinski@intel.com>, Tony Nguyen <anthony.l.nguyen@intel.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.10 086/215] ice: mark PTYPE 2 as reserved Date: Thu, 15 Jul 2021 20:37:38 +0200 Message-Id: <20210715182614.607567535@linuxfoundation.org> In-Reply-To: <20210715182558.381078833@linuxfoundation.org> References: <20210715182558.381078833@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/215] drm/zte: Dont select DRM_KMS_FB_HELPER [5.10,004/215] drm/amd/display: fix HDCP reset sequence on reinitialize [5.10,006/215] drm/vc4: fix argument ordering in vc4_crtc_get_margins() [5.10,007/215] drm/bridge: nwl-dsi: Force a full modeset when crtc_state->active is changed to be... [5.10,008/215] net: pch_gbe: Use proper accessors to BE data in pch_ptp_match() [5.10,010/215] clk: renesas: rcar-usb2-clock-sel: Fix error handling in .probe() [5.10,011/215] hugetlb: clear huge pte during flush function on mips platform [5.10,012/215] atm: iphase: fix possible use-after-free in ia_module_exit() [5.10,014/215] atm: nicstar: Fix possible use-after-free in nicstar_cleanup() [5.10,016/215] drm/mediatek: Fix PM reference leak in mtk_crtc_ddp_hw_init() [5.10,018/215] drm/bridge: lt9611: Add missing MODULE_DEVICE_TABLE [5.10,020/215] drm/virtio: Fix double free on probe failure [5.10,022/215] net/sched: cls_api: increase max_reclassify_loop [5.10,023/215] pinctrl: equilibrium: Add missing MODULE_DEVICE_TABLE [5.10,025/215] drm/sched: Avoid data corruptions [5.10,027/215] drm/vc4: Fix clock source for VEC PixelValve on BCM2711 [5.10,032/215] drm/bridge: cdns: Fix PM reference leak in cdns_dsi_transfer() [5.10,033/215] clk: renesas: r8a77995: Add ZA2 clock [5.10,034/215] net/mlx5e: IPsec/rep_tc: Fix rep_tc_update_skb drops IPsec packet [5.10,036/215] drm: rockchip: add missing registers for RK3188 [5.10,038/215] net: stmmac: the XPCS obscures a potential "PHY not found" error [5.10,040/215] clk: tegra: Fix refcounting of gate clocks [5.10,042/215] drm: bridge: cdns-mhdp8546: Fix PM reference leak in [5.10,045/215] MIPS: cpu-probe: Fix FPU detection on Ingenic JZ4760(B) [5.10,046/215] MIPS: ingenic: Select CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER [5.10,047/215] drm/amd/display: Avoid HDCP over-read and corruption [5.10,054/215] net: bridge: mrp: Update ring transitions. [5.10,057/215] ice: fix clang warning regarding deadcode.DeadStores [5.10,058/215] virtio_net: Remove BUG() to avoid machine dead [5.10,059/215] net: mscc: ocelot: check return value after calling platform_get_resource() [5.10,060/215] net: bcmgenet: check return value after calling platform_get_resource() [5.10,061/215] net: mvpp2: check return value after calling platform_get_resource() [5.10,064/215] drm/amd/display: Fix DCN 3.01 DSCCLK validation [5.10,065/215] drm/amd/display: Update scaling settings on modeset [5.10,066/215] drm/amd/display: Release MST resources on switch from MST to SST [5.10,067/215] drm/amd/display: Set DISPCLK_MAX_ERRDET_CYCLES to 7 [5.10,069/215] net: phy: realtek: add delay to fix RXC generation issue [5.10,070/215] selftests: Clean forgotten resources as part of cleanup() [5.10,073/215] fjes: check return value after calling platform_get_resource() [5.10,074/215] selinux: use __GFP_NOWARN with GFP_NOWAIT in the AVC [5.10,076/215] drm/amd/display: Verify Gamma & Degamma LUT sizes in amdgpu_dm_atomic_check [5.10,079/215] wlcore/wl12xx: Fix wl12xx get_mac error if device is in ELP [5.10,082/215] drm/amdkfd: fix circular locking on get_wave_state [5.10,085/215] ice: fix incorrect payload indicator on PTYPE [5.10,086/215] ice: mark PTYPE 2 as reserved [5.10,089/215] net: ipa: Add missing of_node_put() in ipa_firmware_load() [5.10,091/215] io_uring: fix false WARN_ONCE [5.10,094/215] mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode [5.10,096/215] MIPS: add PMD table accounting into MIPSpmd_alloc_one [5.10,099/215] atm: nicstar: register the interrupt handler in the right place [5.10,103/215] iwlwifi: mvm: fix error print when session protection ends [5.10,107/215] sfc: error code if SRIOV cannot be disabled [5.10,109/215] cfg80211: fix default HE tx bitrate mask in 2G band [5.10,110/215] mac80211: consider per-CPU statistics if present [5.10,111/215] mac80211_hwsim: add concurrent channels scanning support over virtio [5.10,112/215] IB/isert: Align target max I/O size to initiator size [5.10,115/215] RDMA/cma: Fix rdma_resolve_route() memory leak [5.10,117/215] Bluetooth: Fix the HCI to MGMT status conversion table [5.10,119/215] Bluetooth: Shutdown controller after workqueues are flushed or cancelled [5.10,121/215] Bluetooth: L2CAP: Fix invalid access if ECRED Reconfigure fails [5.10,122/215] Bluetooth: L2CAP: Fix invalid access on ECRED Connection response [5.10,123/215] Bluetooth: btusb: Add support USB ALT 3 for WBS [5.10,125/215] Bluetooth: btusb: fix bt fiwmare downloading failure issue for qca btsoc. [5.10,126/215] sched/fair: Ensure _sum and _avg values stay consistent [5.10,127/215] bpf: Fix false positive kmemleak report in bpf_ringbuf_area_alloc() [5.10,130/215] sctp: add size validation when walking chunks [5.10,132/215] MIPS: set mips32r5 for virt extensions [5.10,134/215] MIPS: MT extensions are not available on MIPS32r1 [5.10,135/215] ath11k: unlock on error path in ath11k_mac_op_add_interface() [5.10,136/215] arm64: dts: rockchip: add rk3328 dwc3 usb controller node [5.10,138/215] mm/page_alloc: fix memory map initialization for descending nodes [5.10,139/215] loop: fix I/O error on fsync() in detached loop devices [5.10,143/215] io_uring: convert io_buffer_idr to XArray [5.10,144/215] scsi: iscsi: Fix race condition between login and sync thread [5.10,145/215] scsi: iscsi: Fix iSCSI cls conn state [5.10,147/215] powerpc/barrier: Avoid collision with clangs __lwsync macro [5.10,151/215] drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create() [5.10,152/215] drm/radeon: Call radeon_suspend_kms() in radeon_pci_shutdown() for Loongson64 [5.10,153/215] drm/vc4: txp: Properly set the possible_crtcs mask [5.10,155/215] drm/vc4: hdmi: Prevent clock unbalance [5.10,156/215] drm/dp: Handle zeroed port counts in drm_dp_read_downstream_info() [5.10,158/215] drm/amd/display: fix incorrrect valid irq check [5.10,159/215] pinctrl/amd: Add device HID for new AMD GPIO controller [5.10,161/215] drm/tegra: Dont set allow_fb_modifiers explicitly [5.10,164/215] drm/nouveau: Dont set allow_fb_modifiers explicitly [5.10,167/215] mmc: sdhci: Fix warning message when accessing RPMB in HS400 mode [5.10,171/215] arm64: tlb: fix the TTL value of tlb_get_level [5.10,172/215] cpu/hotplug: Cure the cpusets trainwreck [5.10,174/215] fpga: stratix10-soc: Add missing fpga_mgr_free() call [5.10,176/215] i40e: fix PTP on 5Gb links [5.10,177/215] qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute [5.10,179/215] xfrm: policy: Read seqcount outside of rcu-read side in xfrm_policy_lookup_bytype [5.10,180/215] thermal/drivers/int340x/processor_thermal: Fix tcc setting [5.10,182/215] power: supply: ab8500: Fix an old bug [5.10,184/215] nvmem: core: add a missing of_node_put [5.10,185/215] lkdtm/bugs: XFAIL UNALIGNED_LOAD_STORE_WRITE [5.10,189/215] rq-qos: fix missed wake-ups in rq_qos_throttle try two [5.10,190/215] tracing: Simplify & fix saved_tgids logic [5.10,193/215] coresight: Propagate symlink failure [5.10,194/215] coresight: tmc-etf: Fix global-out-of-bounds in tmc_update_etf_buffer() [5.10,196/215] dm writecache: flush origin device when writing and cache is full [5.10,198/215] PCI: Leave Apple Thunderbolt controllers on for s2idle or standby [5.10,201/215] media: subdev: disallow ioctl for saa6588/davinci [5.10,202/215] media: dtv5100: fix control-request directions [5.10,205/215] media: gspca/sunplus: fix zero-length control requests [5.10,207/215] media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K [5.10,210/215] pinctrl: mcp23s08: Fix missing unlock on error in mcp23s08_irq() [5.10,212/215] jfs: fix GPF in diFree [5.10,213/215] smackfs: restrict bytes count in smk_set_cipso()

Commit Message

Greg KH July 15, 2021, 6:37 p.m. UTC

From: Jacob Keller <jacob.e.keller@intel.com>

[ Upstream commit 0c526d440f76676733cb470b454db9d5507a3a50 ]

The entry for PTYPE 2 in the ice_ptype_lkup table incorrectly states
that this is an L2 packet with no payload. According to the datasheet,
this PTYPE is actually unused and reserved.

Fix the lookup entry to indicate this is an unused entry that is
reserved.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

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 98a7f27c532b..c0ee0541e53f 100644
--- a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
+++ b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
@@ -608,7 +608,7 @@  static const struct ice_rx_ptype_decoded ice_ptype_lkup[] = {
 	/* L2 Packet types */
 	ICE_PTT_UNUSED_ENTRY(0),
 	ICE_PTT(1, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
-	ICE_PTT(2, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),
+	ICE_PTT_UNUSED_ENTRY(2),
 	ICE_PTT_UNUSED_ENTRY(3),
 	ICE_PTT_UNUSED_ENTRY(4),
 	ICE_PTT_UNUSED_ENTRY(5),