From af54dc279ab87d98d05a9a6d6caef3be11ddec55 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Mon, 4 Apr 2022 23:05:06 +0800
Subject: [PATCH] qca-mcs: drop ugly hack

---
 .../101-revert-to-old-build-logic.patch       | 13 --------
 package/qca/{nss => }/qca-mcs/Makefile        | 33 +++++++++----------
 2 files changed, 16 insertions(+), 30 deletions(-)
 delete mode 100644 package/qca/nss/qca-mcs/patches/101-revert-to-old-build-logic.patch
 rename package/qca/{nss => }/qca-mcs/Makefile (65%)

diff --git a/package/qca/nss/qca-mcs/patches/101-revert-to-old-build-logic.patch b/package/qca/nss/qca-mcs/patches/101-revert-to-old-build-logic.patch
deleted file mode 100644
index f35e78b5c7ab40..00000000000000
--- a/package/qca/nss/qca-mcs/patches/101-revert-to-old-build-logic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -32,7 +32,9 @@ ccflags-y += -I$(CURDIR) \
- 	     -I$(KBUILDPATH)/include/asm \
- 	     -I$(KBUILDPATH)/net/bridge
- 
--ccflags-$(CONFIG_SUPPORT_MLD) += -DMC_SUPPORT_MLD
-+ifeq ($(strip ${MC_SUPPORT_MLD}),1)
-+ccflags-y+=-DMC_SUPPORT_MLD
-+endif
- 
- # Module extra compilation flags
- ccflags-y += -Werror -Wall -g
diff --git a/package/qca/nss/qca-mcs/Makefile b/package/qca/qca-mcs/Makefile
similarity index 65%
rename from package/qca/nss/qca-mcs/Makefile
rename to package/qca/qca-mcs/Makefile
index 16129092e74e48..af9372d8998ba2 100644
--- a/package/qca/nss/qca-mcs/Makefile
+++ b/package/qca/qca-mcs/Makefile
@@ -1,27 +1,28 @@
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qca-mcs
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/qca-mcs
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-10-28
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/qca-mcs
 PKG_SOURCE_VERSION:=31f5cd4b83da5a7c0fdca240b4e72677e4523b6e
-PKG_MIRROR_HASH:=1b6997793b51cbeed9520d3183787aaf5ce283cf87ef6603c24cc342654dde61
+PKG_MIRROR_HASH:=3e2e25025dc2e771aafe7d8b12f26ac831d123b34bdd7b7e84bd39c1e933491d
 
+include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/qca-mcs
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Support
-  URL:=http://www.qca.qualcomm.com
-  MAINTAINER:=Qualcomm Atheros, Inc.
   TITLE:=QCA Multicast Snooping Support
-  DEPENDS:=
-  KCONFIG:=CONFIG_NETFILTER=y CONFIG_BRIDGE_NETFILTER=y
+  DEPENDS:=@(TARGET_ipq806x||TARGET_ipq807x)
+  KCONFIG:= \
+	CONFIG_NETFILTER=y \
+	CONFIG_BRIDGE_NETFILTER=y
   FILES:=$(PKG_BUILD_DIR)/qca-mcs.ko
-  AUTOLOAD:=$(call AutoLoad,41,qca-mcs)
+  AUTOLOAD:=$(call AutoLoad,52,qca-mcs)
 endef
 
 define KernelPackage/qca-mcs/description
@@ -39,17 +40,15 @@ define Build/InstallDev
 endef
 
 QCA_MC_SNOOPING_MAKE_OPTS:= \
-	MC_SUPPORT_MLD=1
+        $(KERNEL_MAKE_FLAGS) \
+        CONFIG_SUPPORT_MLD=y \
+        MDIR=$(PKG_BUILD_DIR) \
+        KBUILDPATH=$(LINUX_DIR) \
+        KERNELPATH=$(LINUX_SRC_DIR) \
+        KERNELRELEASE=$(LINUX_RELEASE)
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(LINUX_DIR) \
-		$(KERNEL_MAKE_FLAGS) \
-		KBUILDPATH=$(LINUX_DIR) \
-		$(PKG_MAKE_FLAGS) \
-		M=$(PKG_BUILD_DIR) \
-		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-		$(strip $(QCA_MC_SNOOPING_MAKE_OPTS)) \
-		modules
+	$(MAKE) -C $(LINUX_DIR) M=$(PKG_BUILD_DIR) $(strip $(QCA_MC_SNOOPING_MAKE_OPTS))
 endef
 
 $(eval $(call KernelPackage,qca-mcs))