Merge upstream code into dsl-master

Changelog-NG.txt

@@ -2,6 +2,36 @@ Asuswrt-Merlin 386/NG Changelog
 ===============================
 
 386.2 (xx-xxx-2021)
+  - NEW: Added support for the GT-AX11000.  Note that VPNFusion, as
+         well as the ROG-specific features such as the custom UI
+         are not supported.
+  - NEW: Added support for the RT-AX68U.
+  - NEW: Added jittertimer-rngd daemon to HND routers.  This will
+         ensure sufficient entropy is generated early on at
+         boot time, reducing boot stalls caused by insufficient
+         entropy for the kernel's random number generator,
+         and also generally improves security related to
+         crypto operations by the router.
+  - NEW: Added Cake QoS for HND routers.  Note that just like
+         Traditional QoS, this is not compatible with hardware
+         acceleration, and therefore might not be usable on
+         connections faster than around 350 Mbps (may vary based
+         on router models).
+  - UPDATED: Merged GPL 386_42095.
+  - UPDATED: Openssl to 1.1.1j.
+  - UPDATED: OpenVPN to 2.5.1.
+  - UPDATED: iproute2 to 5.11.0.
+  - FIXED: Router could get stuck at boot time after the user
+           migrated from stock firmware, or just erased his
+           JFFS partition, requiring a factory default reset.
+  - FIXED: ATM checkbox could not be enabled on QOS page.
+  - FIXED: DST not getting applied to some timezones (snauton)
+  - FIXED: Traditional QoS was broken in 386.1 (dave14305)
+  - REMOVED: SSH Brute Force Protection option (already handled
+             by Asuswrt's protect service daemon)
+
+
+386.1_2 (12-Feb-2021)
   - NEW: Added snmp support to the RT-AX86U.
   - UPDATED: inadyn to 2.8.1.
   - UPDATED: nano to 5.5.
@@ -27,6 +57,7 @@ Asuswrt-Merlin 386/NG Changelog
   - FIXED: Erasing the JFFS partition would often require a second
            reboot since the operation failed when encountering
            a bad block.  These are now properly skipped.
+  - FIXED: Parental Control's time scheduler not working properly.
 
 
 386.1 (30-Jan-2021)

README-merlin.txt

@@ -43,6 +43,7 @@ Fully supported devices:
  * RT-AX58U & RT-AX3000
  * RT-AX86U
  * GT-AC2900 (a few ROG-specific features are not available)
+ * GT-AX11000 (A few ROG-specific features are not available)
 
 No longer supported:
  * RT-N16

release/src-rt-5.02axhnd.675x/kernel/linux-4.1/config_base.6a.47622

@@ -1047,11 +1047,11 @@ CONFIG_NET_ACT_MIRRED=y
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y
 # CONFIG_NET_ACT_CSUM is not set
 # CONFIG_NET_ACT_VLAN is not set
 # CONFIG_NET_ACT_BPF is not set
-# CONFIG_NET_ACT_CONNMARK is not set
+CONFIG_NET_ACT_CONNMARK=y
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
@@ -3264,6 +3264,10 @@ CONFIG_BCM_IN_KERNEL=y
 #
 # Asuswrt-merlin configuration
 #
+# Cake Scheduler
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_CLS_MATCHALL=y
+
 # NFS
 
 CONFIG_NFS_FS=m

release/src-rt-5.02axhnd.675x/kernel/linux-4.1/config_base.6a.6750

@@ -1047,11 +1047,11 @@ CONFIG_NET_ACT_MIRRED=y
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y
 # CONFIG_NET_ACT_CSUM is not set
 # CONFIG_NET_ACT_VLAN is not set
 # CONFIG_NET_ACT_BPF is not set
-# CONFIG_NET_ACT_CONNMARK is not set
+CONFIG_NET_ACT_CONNMARK=y
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
@@ -2992,6 +2992,10 @@ CONFIG_BCM_IN_KERNEL=y
 #
 # Asuswrt-merlin configuration
 #
+# Cake Scheduler
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_CLS_MATCHALL=y
+
 # NFS
 
 CONFIG_NFS_FS=m

release/src-rt-5.02axhnd.675x/kernel/linux-4.1/include/uapi/linux/pkt_cls.h

@@ -404,6 +404,17 @@ enum {
 
 #define TCA_BPF_MAX (__TCA_BPF_MAX - 1)
 
+/* Match-all classifier */
+
+enum {
+	TCA_MATCHALL_UNSPEC,
+	TCA_MATCHALL_CLASSID,
+	TCA_MATCHALL_ACT,
+	__TCA_MATCHALL_MAX,
+};
+
+#define TCA_MATCHALL_MAX (__TCA_MATCHALL_MAX - 1)
+
 /* Extended Matches */
 
 struct tcf_ematch_tree_hdr {

release/src-rt-5.02axhnd.675x/kernel/linux-4.1/net/sched/Kconfig

@@ -477,6 +477,16 @@ config NET_CLS_BPF
 	  To compile this code as a module, choose M here: the module will
 	  be called cls_bpf.
 
+config NET_CLS_MATCHALL
+	tristate "Match-all classifier"
+	select NET_CLS
+	---help---
+	  If you say Y here, you will be able to classify packets based on
+	  nothing. Every packet will match.
+
+	  To compile this code as a module, choose M here: the module will
+	  be called cls_matchall.
+
 config NET_EMATCH
 	bool "Extended Matches"
 	select NET_CLS
@@ -734,3 +744,6 @@ endif # NET_SCHED
 
 config NET_SCH_FIFO
 	bool
+
+source "net/sched/sch_cake/Kconfig"
+

release/src-rt-5.02axhnd.675x/kernel/linux-4.1/net/sched/Makefile

@@ -56,6 +56,7 @@ obj-$(CONFIG_NET_CLS_BASIC)	+= cls_basic.o
 obj-$(CONFIG_NET_CLS_FLOW)	+= cls_flow.o
 obj-$(CONFIG_NET_CLS_CGROUP)	+= cls_cgroup.o
 obj-$(CONFIG_NET_CLS_BPF)	+= cls_bpf.o
+obj-$(CONFIG_NET_CLS_MATCHALL)	+= cls_matchall.o
 obj-$(CONFIG_NET_EMATCH)	+= ematch.o
 obj-$(CONFIG_NET_EMATCH_CMP)	+= em_cmp.o
 obj-$(CONFIG_NET_EMATCH_NBYTE)	+= em_nbyte.o
@@ -64,3 +65,4 @@ obj-$(CONFIG_NET_EMATCH_META)	+= em_meta.o
 obj-$(CONFIG_NET_EMATCH_TEXT)	+= em_text.o
 obj-$(CONFIG_NET_EMATCH_CANID)	+= em_canid.o
 obj-$(CONFIG_NET_EMATCH_IPSET)	+= em_ipset.o
+obj-$(CONFIG_NET_SCH_CAKE)	+= sch_cake/