diff --git a/qca/qca-mcs/Makefile b/qca/qca-mcs/Makefile index a0a3eef..e960f8c 100644 --- a/qca/qca-mcs/Makefile +++ b/qca/qca-mcs/Makefile @@ -4,10 +4,10 @@ PKG_NAME:=qca-mcs PKG_RELEASE:=1 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-mcs.git -PKG_SOURCE_DATE:=2023-04-21 +PKG_SOURCE_DATE:=2023-09-13 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=8797823e392ac3d9098c090964afd46805a0eb2b -PKG_MIRROR_HASH:=f0fa76af4545842ebf8b4f0743e1079e190dfa5f3f0d464c063063521d3d30df +PKG_SOURCE_VERSION:=02207cdd83fb5f97a8842954d8134b739564fc01 +PKG_MIRROR_HASH:=1563627094fbf1c9239e9e7d1becd9b3a51332e42481baa32bec6bbe32232093 PKG_BUILD_PARALLEL:=1 diff --git a/qca/qca-mcs/patches/0001-kernel-5.10-compat.patch b/qca/qca-mcs/patches/0001-kernel-5.10-compat.patch index 958a7a3..03ea7fe 100644 --- a/qca/qca-mcs/patches/0001-kernel-5.10-compat.patch +++ b/qca/qca-mcs/patches/0001-kernel-5.10-compat.patch @@ -1,40 +1,18 @@ ---- a/mc_osdep.h -+++ b/mc_osdep.h -@@ -189,7 +189,7 @@ static inline struct net_bridge_port *mc - - dst = os_br_fdb_get((struct net_bridge *)br, eth_hdr(*skb)->h_dest); - -- if (dst && !dst->is_local) -+ if (dst && !test_bit(BR_FDB_LOCAL, &dst->flags)) - return dst->dst; - - return NULL; --- a/mc_snooping.c +++ b/mc_snooping.c -@@ -3453,6 +3453,18 @@ static int mc_proc_snooper_open(struct i - return single_open(file, mc_proc_snooper_show, NULL); - } +@@ -3046,7 +3046,6 @@ static void mc_mdb_cleanup(unsigned long + os_hlist_for_each_entry_rcu(mdb, mdbh, &mc->hash[i], hlist) { + struct mc_port_group *pg; + struct hlist_node *pgh; +- struct net_device *port; + unsigned long expire_time = mc->membership_interval; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+#define HAVE_PROC_OPS -+#endif -+ -+#ifdef HAVE_PROC_OPS -+static const struct proc_ops mc_proc_snooper_fops = { -+ .proc_open = mc_proc_snooper_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+}; -+#else - static const struct file_operations mc_proc_snooper_fops = { - .owner = THIS_MODULE, - .open = mc_proc_snooper_open, -@@ -3460,6 +3472,7 @@ static const struct file_operations mc_p - .llseek = seq_lseek, - .release = single_release, - }; -+#endif - - /* mc_proc_create_snooper_entry - * create proc entry for information show + if (hlist_empty(&mdb->pslist)) { +@@ -3081,7 +3080,6 @@ static void mc_mdb_cleanup(unsigned long + else if (time_before(this_timer, next_timer)) + next_timer = this_timer; + } +- port = pg->port; + } + } + }