From e32969d6bccf32b53117d48ce999e86d0433d47f Mon Sep 17 00:00:00 2001 From: lovehackintosh <92633080+lovehackintosh@users.noreply.github.com> Date: Tue, 20 Dec 2022 23:13:01 +0800 Subject: [PATCH] Kernel: bump to 5.4.228, 5.10.160, 5.15.84 (#10656) * kernel: bump 5.10 to 5.10.160 No patches affected by this update. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia * kernel: bump 5.15 to 5.15.84 Signed-off-by: John Audia * kernel: bump 5.4 to 5.4.228 Signed-off-by: Linhui Liu Signed-off-by: John Audia Signed-off-by: Linhui Liu Co-authored-by: John Audia --- include/kernel-5.10 | 4 ++-- include/kernel-5.15 | 4 ++-- include/kernel-5.4 | 4 ++-- .../900-v6.10-backport-stddef.patch | 14 +++++++---- .../901-v6.10-backport-net-device-path.patch | 4 ++-- .../902-v6.10-backport-minmax.patch | 2 +- .../903-v6.10-backport-genl-small-ops.patch | 24 +++++++++---------- .../400-block-fit-partition-parser.patch | 2 +- .../generic/hack-5.4/721-phy_packets.patch | 8 +++---- ...w_table-add-hardware-offload-support.patch | 6 ++--- ...w_table-support-hw-offload-through-v.patch | 6 ++--- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 2 +- ...dd-support-for-threaded-NAPI-polling.patch | 4 ++-- ...4019-needs-rfs-vlan_tag-callbacks-in.patch | 2 +- .../patches-5.4/995-add-qca-rfs-support.patch | 2 +- .../999-03a-qca-nss-ecm-support.patch | 6 ++--- .../999-03b-qca-nss-ecm-support.patch | 2 +- 17 files changed, 50 insertions(+), 46 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index bd40dc0f4..abfb0422d 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .159 -LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7 +LINUX_VERSION-5.10 = .160 +LINUX_KERNEL_HASH-5.10.160 = 30d5076acae863941045880c4c5c5109d26a54a932168fa1324237e8aeaa840b diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 9a619067d..5013ce44e 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .83 -LINUX_KERNEL_HASH-5.15.83 = 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 +LINUX_VERSION-5.15 = .84 +LINUX_KERNEL_HASH-5.15.84 = 318dc30cb059c2e35b59652b166b39804bb3a941f11878aae6119019a04b8217 diff --git a/include/kernel-5.4 b/include/kernel-5.4 index b0b5a1766..5d20b0504 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .227 -LINUX_KERNEL_HASH-5.4.227 = 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593 +LINUX_VERSION-5.4 = .228 +LINUX_KERNEL_HASH-5.4.228 = 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 diff --git a/target/linux/generic/backport-5.4/900-v6.10-backport-stddef.patch b/target/linux/generic/backport-5.4/900-v6.10-backport-stddef.patch index 7f45c3bf2..3f80765cc 100644 --- a/target/linux/generic/backport-5.4/900-v6.10-backport-stddef.patch +++ b/target/linux/generic/backport-5.4/900-v6.10-backport-stddef.patch @@ -1,6 +1,6 @@ --- a/include/linux/stddef.h +++ b/include/linux/stddef.h -@@ -35,5 +35,66 @@ +@@ -35,5 +35,66 @@ enum { */ #define offsetofend(TYPE, MEMBER) \ (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) @@ -67,7 +67,7 @@ + __DECLARE_FLEX_ARRAY(TYPE, NAME) #endif ---- a/dev/null +--- /dev/null +++ b/tools/include/uapi/linux/stddef.h @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ @@ -117,10 +117,10 @@ + TYPE NAME[]; \ + } +#endif ---- a/dev/null +--- a/include/uapi/linux/stddef.h +++ b/include/uapi/linux/stddef.h -@@ -0,0 +1,47 @@ -+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +@@ -1,4 +1,51 @@ + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI_LINUX_STDDEF_H +#define _UAPI_LINUX_STDDEF_H + @@ -167,3 +167,7 @@ + TYPE NAME[]; \ + } +#endif ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ + #include + + #ifndef __always_inline diff --git a/target/linux/generic/backport-5.4/901-v6.10-backport-net-device-path.patch b/target/linux/generic/backport-5.4/901-v6.10-backport-net-device-path.patch index 4afea2782..ab7e3fa96 100644 --- a/target/linux/generic/backport-5.4/901-v6.10-backport-net-device-path.patch +++ b/target/linux/generic/backport-5.4/901-v6.10-backport-net-device-path.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -838,6 +838,61 @@ +@@ -835,6 +835,61 @@ typedef u16 (*select_queue_fallback_t)(s struct sk_buff *skb, struct net_device *sb_dev); @@ -62,7 +62,7 @@ enum tc_setup_type { TC_SETUP_QDISC_MQPRIO, TC_SETUP_CLSU32, -@@ -1468,6 +1523,8 @@ +@@ -1441,6 +1496,8 @@ struct net_device_ops { u32 flags); int (*ndo_xsk_wakeup)(struct net_device *dev, u32 queue_id, u32 flags); diff --git a/target/linux/generic/backport-5.4/902-v6.10-backport-minmax.patch b/target/linux/generic/backport-5.4/902-v6.10-backport-minmax.patch index 1a393b1d7..3f733f91f 100644 --- a/target/linux/generic/backport-5.4/902-v6.10-backport-minmax.patch +++ b/target/linux/generic/backport-5.4/902-v6.10-backport-minmax.patch @@ -1,4 +1,4 @@ ---- a/dev/null +--- /dev/null +++ b/include/linux/minmax.h @@ -0,0 +1,169 @@ +/* SPDX-License-Identifier: GPL-2.0 */ diff --git a/target/linux/generic/backport-5.4/903-v6.10-backport-genl-small-ops.patch b/target/linux/generic/backport-5.4/903-v6.10-backport-genl-small-ops.patch index 3be3147af..f7288ae5a 100644 --- a/target/linux/generic/backport-5.4/903-v6.10-backport-genl-small-ops.patch +++ b/target/linux/generic/backport-5.4/903-v6.10-backport-genl-small-ops.patch @@ -1,6 +1,6 @@ --- a/include/net/genetlink.h +++ b/include/net/genetlink.h -@@ -51,6 +51,7 @@ +@@ -51,6 +51,7 @@ struct genl_family { unsigned int maxattr; bool netnsok; bool parallel_ops; @@ -8,7 +8,7 @@ const struct nla_policy *policy; int (*pre_doit)(const struct genl_ops *ops, struct sk_buff *skb, -@@ -60,6 +61,7 @@ +@@ -60,6 +61,7 @@ struct genl_family { struct genl_info *info); struct nlattr ** attrbuf; /* private */ const struct genl_ops * ops; @@ -16,13 +16,10 @@ const struct genl_multicast_group *mcgrps; unsigned int n_ops; unsigned int n_mcgrps; -@@ -117,6 +119,27 @@ - GENL_DONT_VALIDATE_STRICT = BIT(0), - GENL_DONT_VALIDATE_DUMP = BIT(1), - GENL_DONT_VALIDATE_DUMP_STRICT = BIT(2), -+}; -+ -+/** +@@ -120,6 +122,27 @@ enum genl_validate_flags { + }; + + /** + * struct genl_small_ops - generic netlink operations (small version) + * @cmd: command identifier + * @internal_flags: flags used by the family @@ -41,6 +38,9 @@ + u8 internal_flags; + u8 flags; + u8 validate; - }; - - /** ++}; ++ ++/** + * struct genl_ops - generic netlink operations + * @cmd: command identifier + * @internal_flags: flags used by the family diff --git a/target/linux/generic/hack-5.4/400-block-fit-partition-parser.patch b/target/linux/generic/hack-5.4/400-block-fit-partition-parser.patch index 6b3267ef8..fb4565d22 100644 --- a/target/linux/generic/hack-5.4/400-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-5.4/400-block-fit-partition-parser.patch @@ -91,7 +91,7 @@ #ifdef CONFIG_FAIL_MAKE_REQUEST &dev_attr_fail.attr, #endif -@@ -634,6 +652,10 @@ rescan: +@@ -641,6 +659,10 @@ rescan: if (state->parts[p].flags & ADDPART_FLAG_RAID) md_autodetect_dev(part_to_dev(part)->devt); #endif diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch index 8c16ba322..386b243e8 100644 --- a/target/linux/generic/hack-5.4/721-phy_packets.patch +++ b/target/linux/generic/hack-5.4/721-phy_packets.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1549,6 +1549,7 @@ enum netdev_priv_flags { +@@ -1606,6 +1606,7 @@ enum netdev_priv_flags { IFF_FAILOVER_SLAVE = 1<<28, IFF_L3MDEV_RX_HANDLER = 1<<29, IFF_LIVE_RENAME_OK = 1<<30, @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1581,6 +1582,7 @@ enum netdev_priv_flags { +@@ -1638,6 +1639,7 @@ enum netdev_priv_flags { #define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER #define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK @@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau /* Specifies the type of the struct net_device::ml_priv pointer */ enum netdev_ml_priv_type { -@@ -1889,6 +1891,11 @@ struct net_device { +@@ -1946,6 +1948,11 @@ struct net_device { const struct tlsdev_ops *tlsdev_ops; #endif @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau const struct header_ops *header_ops; unsigned int flags; -@@ -1971,6 +1978,10 @@ struct net_device { +@@ -2028,6 +2035,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif diff --git a/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index 739f94b77..726b290f2 100644 --- a/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -23,7 +23,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -928,6 +928,13 @@ struct devlink; +@@ -983,6 +983,13 @@ struct devlink; struct tlsdev_ops; @@ -37,7 +37,7 @@ Signed-off-by: Pablo Neira Ayuso /* * This structure defines the management hooks for network devices. * The following hooks can be defined; unless noted otherwise, they are -@@ -1160,6 +1167,10 @@ struct tlsdev_ops; +@@ -1215,6 +1222,10 @@ struct tlsdev_ops; * int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh, * u16 flags); * @@ -48,7 +48,7 @@ Signed-off-by: Pablo Neira Ayuso * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); * Called to change device carrier. Soft-devices (like dummy, team, etc) * which do not represent real hardware may define this to allow their -@@ -1407,6 +1418,8 @@ struct net_device_ops { +@@ -1462,6 +1473,8 @@ struct net_device_ops { int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh, u16 flags); diff --git a/target/linux/generic/pending-5.4/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch b/target/linux/generic/pending-5.4/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch index 677c94623..94574d8d1 100644 --- a/target/linux/generic/pending-5.4/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch +++ b/target/linux/generic/pending-5.4/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -929,6 +929,7 @@ struct tlsdev_ops; +@@ -984,6 +984,7 @@ struct tlsdev_ops; struct flow_offload; @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau enum flow_offload_type { FLOW_OFFLOAD_ADD = 0, -@@ -1167,8 +1168,15 @@ enum flow_offload_type { +@@ -1222,8 +1223,15 @@ enum flow_offload_type { * int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh, * u16 flags); * @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau * Adds/deletes flow entry to/from net device flowtable. * * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); -@@ -1418,8 +1426,11 @@ struct net_device_ops { +@@ -1473,8 +1481,11 @@ struct net_device_ops { int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh, u16 flags); diff --git a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index f584189b7..8c4a4b5b1 100644 --- a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1931,6 +1931,8 @@ struct net_device { +@@ -1988,6 +1988,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch index df22627fc..f6d9d3620 100644 --- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch +++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch @@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau }; enum gro_result { -@@ -2101,6 +2104,7 @@ struct net_device { +@@ -2158,6 +2161,7 @@ struct net_device { struct lock_class_key addr_list_lock_key; bool proto_down; unsigned wol_enabled:1; @@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau }; #define to_net_dev(d) container_of(d, struct net_device, dev) -@@ -2281,6 +2285,26 @@ void netif_napi_add(struct net_device *d +@@ -2338,6 +2342,26 @@ void netif_napi_add(struct net_device *d int (*poll)(struct napi_struct *, int), int weight); /** diff --git a/target/linux/ipq40xx/patches-5.4/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch b/target/linux/ipq40xx/patches-5.4/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch index 167673bd1..86e1cb77e 100644 --- a/target/linux/ipq40xx/patches-5.4/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch +++ b/target/linux/ipq40xx/patches-5.4/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch @@ -41,7 +41,7 @@ Reviewed-by: Grant Grundler /* * This structure holds all XPS maps for device. Maps are indexed by CPU. */ -@@ -1379,6 +1389,9 @@ struct net_device_ops { +@@ -1434,6 +1444,9 @@ struct net_device_ops { const struct sk_buff *skb, u16 rxq_index, u32 flow_id); diff --git a/target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch b/target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch index cb3dd9952..e66d06316 100644 --- a/target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch +++ b/target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch @@ -40,7 +40,7 @@ #endif --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2596,6 +2596,8 @@ enum netdev_cmd { +@@ -2653,6 +2653,8 @@ enum netdev_cmd { NETDEV_CVLAN_FILTER_DROP_INFO, NETDEV_SVLAN_FILTER_PUSH_INFO, NETDEV_SVLAN_FILTER_DROP_INFO, diff --git a/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch b/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch index 9e4357a96..2573a267d 100644 --- a/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch +++ b/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch @@ -106,7 +106,7 @@ __be16 vlan_proto, u16 vlan_id) --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1590,6 +1590,20 @@ enum netdev_ml_priv_type { +@@ -1647,6 +1647,20 @@ enum netdev_ml_priv_type { ML_PRIV_CAN, }; @@ -127,7 +127,7 @@ /** * struct net_device - The DEVICE structure. * -@@ -1900,6 +1914,7 @@ struct net_device { +@@ -1957,6 +1971,7 @@ struct net_device { unsigned int flags; unsigned int priv_flags; @@ -135,7 +135,7 @@ unsigned short gflags; unsigned short padded; -@@ -2583,6 +2598,10 @@ enum netdev_cmd { +@@ -2640,6 +2655,10 @@ enum netdev_cmd { NETDEV_CVLAN_FILTER_DROP_INFO, NETDEV_SVLAN_FILTER_PUSH_INFO, NETDEV_SVLAN_FILTER_DROP_INFO, diff --git a/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch b/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch index 487b008c4..a9684f78b 100644 --- a/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch +++ b/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch @@ -19,7 +19,7 @@ extern void br_fdb_unregister_notify(struct notifier_block *nb); --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1596,12 +1596,18 @@ enum netdev_priv_qca_ecm_flags { +@@ -1653,12 +1653,18 @@ enum netdev_priv_qca_ecm_flags { IFF_QCA_ECM_PPP_L2TPV2 = 1<<1, IFF_QCA_ECM_PPP_L2TPV3 = 1<<2, IFF_QCA_ECM_PPP_PPTP = 1<<3,