Revert "Merge branch 'develop' into ipq60xx"

This reverts commit 046f5955b3, reversing
changes made to ae3e435020.

fast-classifier/Makefile

@@ -1,10 +0,0 @@
-obj-$(CONFIG_FAST_CLASSIFIER) += fast-classifier.o
-
-ifeq ($(SFE_SUPPORT_IPV6),)
-SFE_SUPPORT_IPV6=y
-endif
-ccflags-$(SFE_SUPPORT_IPV6) += -DSFE_SUPPORT_IPV6
-
-ccflags-y += -I$(obj)/../shortcut-fe
-
-obj ?= .

shortcut-fe/Makefile

@@ -1,23 +0,0 @@
-#
-# Makefile for Shortcut FE.
-#
-
-obj-m += shortcut-fe.o
-
-ifdef SFE_SUPPORT_IPV6
-obj-m += shortcut-fe-ipv6.o
-endif
-
-obj-m += shortcut-fe-cm.o
-
-shortcut-fe-objs := \
-	sfe_ipv4.o
-
-ifdef SFE_SUPPORT_IPV6
-shortcut-fe-ipv6-objs := \
-	sfe_ipv6.o
-endif
-
-shortcut-fe-cm-objs := \
-	sfe_cm.o
-

simulated-driver/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 The Linux Foundation. All rights reserved.
+# Copyright (c) 2015,2016 The Linux Foundation. All rights reserved.
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
 # above copyright notice and this permission notice appear in all copies.
@@ -11,11 +11,50 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# Makefile for Shortcut FE simulated driver.
-#
 
-obj-m += shortcut-fe-drv.o
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
-shortcut-fe-drv-objs := \
+PKG_NAME:=shortcut-fe-simulated-driver
-	sfe_drv.o
+PKG_RELEASE:=1
 
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/shortcut-fe
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-03-17
+PKG_SOURCE_VERSION:=697977d8d0ccf0ab596e5692d08608a75dd7f33d
+PKG_MIRROR_HASH:=659fa82a431e15af797a6c7069faeee02810453ad8b576c51c29f95a1761a045
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/shortcut-fe-drv
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Support
+  DEPENDS:=@TARGET_ipq60xx||@TARGET_ipq806x||TARGET_ipq807x +kmod-shortcut-fe
+  KCONFIG:= \
+	   CONFIG_NET_CLS_ACT=y \
+	   CONFIG_XFRM=y
+  TITLE:=Simulated sfe driver for ECM
+  FILES:=$(PKG_BUILD_DIR)/simulated-driver/shortcut-fe-drv.ko
+endef
+
+define KernelPackage/shortcut-fe-drv/Description
+Simulated sfe driver which act as an adapter to convert message
+between a connection manager and the SFE core engine.
+endef
+
+define Build/Compile
+	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
+		$(KERNEL_MAKE_FLAGS) \
+		$(PKG_MAKE_FLAGS) \
+		M="$(PKG_BUILD_DIR)/simulated-driver" \
+		EXTRA_CFLAGS="-DSFE_SUPPORT_IPV6" \
+		modules
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/shortcut-fe
+	$(CP) -rf $(PKG_BUILD_DIR)/simulated-driver/sfe_drv.h $(1)/usr/include/shortcut-fe
+endef
+
+$(eval $(call KernelPackage,shortcut-fe-drv))