Revert "Revert "Merge branch 'develop'""

This reverts commit f0937d0399.

root/target/linux/generic/hack-5.4/998-ndpi-netfilter.patch

@@ -1,116 +0,0 @@
-diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
-index 21f887c..59980ec 100644
---- a/include/net/netfilter/nf_conntrack_extend.h
-+++ b/include/net/netfilter/nf_conntrack_extend.h
-@@ -28,7 +28,8 @@ enum nf_ct_ext_id {
- #if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY)
- 	NF_CT_EXT_SYNPROXY,
- #endif
--	NF_CT_EXT_NUM,
-+	NF_CT_EXT_CUSTOM,
-+	NF_CT_EXT_NUM=NF_CT_EXT_CUSTOM+CONFIG_NF_CONNTRACK_CUSTOM,
- };
- 
- #define NF_CT_EXT_HELPER_TYPE struct nf_conn_help
-@@ -96,5 +97,6 @@ struct nf_ct_ext_type {
- };
- 
- int nf_ct_extend_register(const struct nf_ct_ext_type *type);
-+int nf_ct_extend_custom_register(struct nf_ct_ext_type *type,unsigned long int cid);
- void nf_ct_extend_unregister(const struct nf_ct_ext_type *type);
- #endif /* _NF_CONNTRACK_EXTEND_H */
-diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
-index 7581e82..30a11eb 100644
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -85,6 +85,16 @@ config NF_CONNTRACK_SECMARK
- 
- 	  If unsure, say 'N'.
- 
-+config NF_CONNTRACK_CUSTOM
-+	int "Number of custom extend"
-+	range 0 8
-+	depends on NETFILTER_ADVANCED
-+	default "2"
-+	help
-+	  This parameter specifies how many custom extensions can be registered.
-+
-+	  The default value is 2.
-+
- config NF_CONNTRACK_ZONES
- 	bool  'Connection tracking zones'
- 	depends on NETFILTER_ADVANCED
-diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
-index 85f643c..44e2fdd 100644
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -1971,7 +1971,7 @@ int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp)
- static __always_inline unsigned int total_extension_size(void)
- {
- 	/* remember to add new extensions below */
--	BUILD_BUG_ON(NF_CT_EXT_NUM > 9);
-+	BUILD_BUG_ON(NF_CT_EXT_NUM > 12);
- 
- 	return sizeof(struct nf_ct_ext) +
- 	       sizeof(struct nf_conn_help)
-diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c
-index 9fe0ddc..5a9054e 100644
---- a/net/netfilter/nf_conntrack_extend.c
-+++ b/net/netfilter/nf_conntrack_extend.c
-@@ -108,11 +108,56 @@ int nf_ct_extend_register(const struct nf_ct_ext_type *type)
- }
- EXPORT_SYMBOL_GPL(nf_ct_extend_register);
- 
-+static unsigned long int nf_ct_ext_cust_id[CONFIG_NF_CONNTRACK_CUSTOM];
-+static enum nf_ct_ext_id 
-+nf_ct_extend_get_custom_id(unsigned long int ext_id);
-+
-+int nf_ct_extend_custom_register(struct nf_ct_ext_type *type,
-+				 unsigned long int cid)
-+{
-+	int ret;
-+	enum nf_ct_ext_id new_id = nf_ct_extend_get_custom_id(cid);
-+	if(!new_id)
-+		return -EBUSY;
-+	type->id = new_id;
-+	ret = nf_ct_extend_register(type);
-+	if(ret < 0) {
-+		mutex_lock(&nf_ct_ext_type_mutex);
-+		nf_ct_ext_cust_id[new_id - NF_CT_EXT_CUSTOM] = 0;
-+		mutex_unlock(&nf_ct_ext_type_mutex);
-+	}
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(nf_ct_extend_custom_register);
-+
-+static enum nf_ct_ext_id 
-+nf_ct_extend_get_custom_id(unsigned long int ext_id)
-+{
-+	enum nf_ct_ext_id ret = 0;
-+	int i;
-+	mutex_lock(&nf_ct_ext_type_mutex);
-+	for(i = 0; i < CONFIG_NF_CONNTRACK_CUSTOM; i++) {
-+		if(!nf_ct_ext_cust_id[i]) {
-+			nf_ct_ext_cust_id[i] = ext_id;
-+			ret = i+NF_CT_EXT_CUSTOM;
-+			break;
-+		}
-+		if(nf_ct_ext_cust_id[i] == ext_id) {
-+			ret = i+NF_CT_EXT_CUSTOM;
-+			break;
-+		}
-+	}
-+	mutex_unlock(&nf_ct_ext_type_mutex);
-+	return ret;
-+}
-+
- /* This MUST be called in process context. */
- void nf_ct_extend_unregister(const struct nf_ct_ext_type *type)
- {
- 	mutex_lock(&nf_ct_ext_type_mutex);
- 	RCU_INIT_POINTER(nf_ct_ext_types[type->id], NULL);
-+	if(type->id >= NF_CT_EXT_CUSTOM && type->id < NF_CT_EXT_NUM)
-+		nf_ct_ext_cust_id[type->id-NF_CT_EXT_CUSTOM] = 0;
- 	mutex_unlock(&nf_ct_ext_type_mutex);
- 	synchronize_rcu();
- }

root/target/linux/generic/hack-5.4/999-stop-promiscuous-info.patch

@@ -1,47 +0,0 @@
---- a/net/core/dev.c	2018-08-10 10:31:41.199494561 +0200
-+++ b/net/core/dev.c	2018-08-10 10:32:03.635272509 +0200
-@@ -6613,9 +6613,11 @@
- 		}
- 	}
- 	if (dev->flags != old_flags) {
-+		/*
- 		pr_info("device %s %s promiscuous mode\n",
- 			dev->name,
- 			dev->flags & IFF_PROMISC ? "entered" : "left");
-+		*/
- 		if (audit_enabled) {
- 			current_uid_gid(&uid, &gid);
- 			audit_log(current->audit_context, GFP_ATOMIC,
---- a/drivers/net/usb/r8152.c	2020-08-13 13:11:25.866435255 +0200
-+++ b/drivers/net/usb/r8152.c	2020-08-13 13:11:51.973994306 +0200
-@@ -2353,7 +2353,7 @@
- 
- 	if (netdev->flags & IFF_PROMISC) {
- 		/* Unconditionally log net taps. */
--		netif_notice(tp, link, netdev, "Promiscuous mode enabled\n");
-+		//netif_notice(tp, link, netdev, "Promiscuous mode enabled\n");
- 		ocp_data |= RCR_AM | RCR_AAP;
- 		mc_filter[1] = 0xffffffff;
- 		mc_filter[0] = 0xffffffff;
---- a/drivers/net/usb/pegasus.c	2020-08-13 13:14:15.519570376 +0200
-+++ b/drivers/net/usb/pegasus.c	2020-08-13 13:14:26.795380006 +0200
-@@ -1031,7 +1031,7 @@
- 
- 	if (net->flags & IFF_PROMISC) {
- 		pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;
--		netif_info(pegasus, link, net, "Promiscuous mode enabled\n");
-+		//netif_info(pegasus, link, net, "Promiscuous mode enabled\n");
- 	} else if (!netdev_mc_empty(net) || (net->flags & IFF_ALLMULTI)) {
- 		pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;
- 		pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
---- a/drivers/net/ethernet/realtek/r8169_main.c	2020-08-13 13:15:44.478068638 +0200
-+++ b/drivers/net/ethernet/realtek/r8169_main.c	2020-08-13 13:15:59.181820450 +0200
-@@ -4313,7 +4313,7 @@
- 
- 	if (dev->flags & IFF_PROMISC) {
- 		/* Unconditionally log net taps. */
--		netif_notice(tp, link, dev, "Promiscuous mode enabled\n");
-+		//netif_notice(tp, link, dev, "Promiscuous mode enabled\n");
- 		rx_mode |= AcceptAllPhys;
- 	} else if (netdev_mc_count(dev) > MC_FILTER_LIMIT ||
- 		   dev->flags & IFF_ALLMULTI ||