From 256ab6f77f61c2979d3e74f3533a0dd122aac5c5 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Sun, 3 Mar 2024 00:01:06 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.270 (#11942) --- include/kernel-5.4 | 4 ++-- ...et-bridge-clear-bridge-s-private-skb-space-on-xmit.patch | 6 +++--- ...tfilter-nf_flow_table-add-hardware-offload-support.patch | 6 +++--- ...643-net-bridge-support-hardware-flow-table-offload.patch | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index 4bb30b593..1228bf3bf 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .269 -LINUX_KERNEL_HASH-5.4.269 = ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf +LINUX_VERSION-5.4 = .270 +LINUX_KERNEL_HASH-5.4.270 = 1a4b069beaedd77934cabbbf00480ba93882d601e683e7bd588997bde39d766b diff --git a/target/linux/generic/backport-5.4/610-v5.9-net-bridge-clear-bridge-s-private-skb-space-on-xmit.patch b/target/linux/generic/backport-5.4/610-v5.9-net-bridge-clear-bridge-s-private-skb-space-on-xmit.patch index 5704d05aa..a811c0dad 100644 --- a/target/linux/generic/backport-5.4/610-v5.9-net-bridge-clear-bridge-s-private-skb-space-on-xmit.patch +++ b/target/linux/generic/backport-5.4/610-v5.9-net-bridge-clear-bridge-s-private-skb-space-on-xmit.patch @@ -17,9 +17,9 @@ Signed-off-by: David S. Miller --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c -@@ -35,6 +35,8 @@ netdev_tx_t br_dev_xmit(struct sk_buff * - const unsigned char *dest; - u16 vid = 0; +@@ -37,6 +37,8 @@ netdev_tx_t br_dev_xmit(struct sk_buff * + + memset(skb->cb, 0, sizeof(struct br_input_skb_cb)); + memset(skb->cb, 0, sizeof(struct br_input_skb_cb)); + 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 4b97d6276..2d71dddf3 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 @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -6005,6 +6005,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -6006,6 +6006,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -6149,10 +6156,19 @@ static int nf_tables_newflowtable(struct +@@ -6150,10 +6157,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -6278,7 +6294,8 @@ static int nf_tables_fill_flowtable_info +@@ -6279,7 +6295,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), diff --git a/target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch index d47482dc6..fcfac748c 100644 --- a/target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau #include #include "br_private.h" -@@ -382,6 +386,28 @@ static const struct ethtool_ops br_ethto +@@ -384,6 +388,28 @@ static const struct ethtool_ops br_ethto .get_link = ethtool_op_get_link, }; @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau static const struct net_device_ops br_netdev_ops = { .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, -@@ -410,6 +436,9 @@ static const struct net_device_ops br_ne +@@ -412,6 +438,9 @@ static const struct net_device_ops br_ne .ndo_bridge_setlink = br_setlink, .ndo_bridge_dellink = br_dellink, .ndo_features_check = passthru_features_check,