Merge 054fbbfb11cc9bc994fbee028d6e11db0fa69f59 on remote branch

Change-Id: Id5073f41e9064018a47dffb74a624aada14bd61f

BUILD.bazel

@@ -8,6 +8,10 @@ define_modules("pineapple", "gki")
 define_modules("blair", "consolidate")
 
 define_modules("blair", "gki")
+
+define_modules("monaco", "consolidate")
+
+define_modules("monaco", "gki")
 package(
     default_visibility = [
         "//visibility:public",

core/Android.mk

@@ -2,6 +2,7 @@ ifeq ($(TARGET_DATARMNET_ENABLE), true)
 ifneq ($(TARGET_BOARD_PLATFORM),qssi)
 RMNET_CORE_DLKM_PLATFORMS_LIST := pineapple
 RMNET_CORE_DLKM_PLATFORMS_LIST += blair
+RMNET_CORE_DLKM_PLATFORMS_LIST += monaco
 
 ifeq ($(call is-board-platform-in-list, $(RMNET_CORE_DLKM_PLATFORMS_LIST)),true)
 #Make file to create RMNET_CORE DLKM

core/Kbuild

@@ -1,4 +1,4 @@
-ifneq (, $(filter y, $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_BLAIR)))
+ifneq (, $(filter y, $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_BLAIR) $(CONFIG_ARCH_MONACO)))
 ccflags-y	+= -DRMNET_LA_PLATFORM
 endif
 

core/Kconfig

@@ -21,7 +21,7 @@ config RMNET_CTL
 config RMNET_LA_PLATFORM
 	default y
 	bool "RMNET platform support"
-	depends on ARCH_PINEAPPLE || ARCH_BLAIR
+	depends on ARCH_PINEAPPLE || ARCH_BLAIR || ARCH_MONACO
 	help
 	  Enable the functionality gated by the RMNET_LA_PLATFORM configuration
 	  in rmnet driver.

core/rmnet_handlers.c

@@ -445,7 +445,11 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)
 	dev = skb->dev;
 	port = rmnet_get_port(dev);
 	if (unlikely(!port)) {
+#if (KERNEL_VERSION(6, 0, 0) < LINUX_VERSION_CODE)
 		dev_core_stats_rx_nohandler_inc(skb->dev);
+#else
+		atomic_long_inc(&skb->dev->rx_nohandler);
+#endif
 		kfree_skb(skb);
 		goto done;
 	}

datarmnet_dlkm_vendor_board.mk

@@ -12,6 +12,7 @@ ifeq ($(TARGET_DATARMNET_ENABLE), true)
 	#Build rmnet core
 	DATA_DLKM_BOARD_PLATFORMS_LIST := pineapple
 	DATA_DLKM_BOARD_PLATFORMS_LIST += blair
+	DATA_DLKM_BOARD_PLATFORMS_LIST += monaco
 
 	ifneq ($(TARGET_BOARD_AUTO),true)
 		ifeq ($(call is-board-platform-in-list,$(DATA_DLKM_BOARD_PLATFORMS_LIST)),true)

define_modules.bzl

@@ -28,6 +28,11 @@ def define_modules(target, variant):
                     "core/rmnet_ctl_client.c",
                 ],
             },
+            "CONFIG_ARCH_MONACO": {
+                True: [
+                    "core/rmnet_ctl_client.c",
+                ],
+            },
         },
         kernel_build = "//msm-kernel:{}".format(kernel_build_variant),
         deps = [