From b02764ce1cf318635cd6be0c938a8a33d8330939 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 2 Jul 2024 10:28:05 +0000 Subject: [PATCH] net: Disable realtek driver to compile for K5.14 Disabling build of ethernet and wireless realtek driver for building with k5.14 kernel due to build issue. Drivers are r8126 and rtl8822ce. Bug 4729493 Change-Id: I016484a81c9a28a460a8592e80e123a7ca11222e Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3166764 GVS: buildbot_gerritrpt Reviewed-by: svcacv --- drivers/net/ethernet/realtek/r8126/Makefile | 4 ++++ drivers/net/wireless/realtek/Makefile | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8126/Makefile b/drivers/net/ethernet/realtek/r8126/Makefile index ae6154cb..c4fed6d5 100644 --- a/drivers/net/ethernet/realtek/r8126/Makefile +++ b/drivers/net/ethernet/realtek/r8126/Makefile @@ -32,11 +32,15 @@ LINUX_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL)) LINUX_VERSION_6_9 := $(shell expr 6 \* 256 + 9) +LINUX_VERSION_5_14 := $(shell expr 5 \* 256 + 14) # Use dummy R8126 driver for Kernel versions greater that K69 ifeq ($(shell test $(LINUX_VERSION) -gt $(LINUX_VERSION_6_9); echo $$?),0) obj-m := r8126.o r8126-objs := r8126_dummy.o +else ifeq ($(shell test $(LINUX_VERSION) -eq $(LINUX_VERSION_5_14); echo $$?),0) +obj-m := r8126.o +r8126-objs := r8126_dummy.o else CONFIG_SOC_LAN = n diff --git a/drivers/net/wireless/realtek/Makefile b/drivers/net/wireless/realtek/Makefile index ce8bbe74..f163c345 100644 --- a/drivers/net/wireless/realtek/Makefile +++ b/drivers/net/wireless/realtek/Makefile @@ -1,8 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved. + +LINUX_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL)) +LINUX_VERSION_5_14 := $(shell expr 5 \* 256 + 14) + +# Do not build driver for K5.14 +ifneq ($(shell test $(LINUX_VERSION) -eq $(LINUX_VERSION_5_14); echo $$?),0) ifndef CONFIG_TEGRA_SYSTEM_TYPE_ACK ifeq ($(shell expr \( $(VERSION) \) \* 10000 + \( $(PATCHLEVEL) \) \* 100 + \( $(SUBLEVEL) \) \<= 60500), 1) obj-m += rtl8822ce/ endif endif +endif