diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-11-13 00:44:25 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-11-13 01:06:12 +0100 |
| commit | 079ce0413a1e3c19dd00be1b90de737c2bc09223 (patch) | |
| tree | 2b8a95a2775fc260023e5637b70642ac7ba277ce /target/linux/generic/pending-5.4 | |
| parent | dec6584b22bad48fb0f21904bc552697360005b0 (diff) | |
| download | upstream-079ce0413a1e3c19dd00be1b90de737c2bc09223.tar.gz upstream-079ce0413a1e3c19dd00be1b90de737c2bc09223.tar.bz2 upstream-079ce0413a1e3c19dd00be1b90de737c2bc09223.zip | |
kernel: bump 5.4 to 5.4.224
Manually adapted:
generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch
Compile-tested: x86/64
Run-tested: x86/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4')
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.4/655-increase_skb_pad.patch b/target/linux/generic/pending-5.4/655-increase_skb_pad.patch index ab7939570d..16c65ce3f7 100644 --- a/target/linux/generic/pending-5.4/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-5.4/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2658,7 +2658,7 @@ static inline int pskb_network_may_pull( +@@ -2660,7 +2660,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 28901d7135..10e58b4907 100644 --- a/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> kfree(net->ipv6.ip6_blk_hole_entry); #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); -@@ -6428,6 +6477,9 @@ void __init ip6_route_init_special_entri +@@ -6434,6 +6483,9 @@ void __init ip6_route_init_special_entri init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); 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 abdf445ccf..3162efd41f 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 @@ -22,10 +22,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -824,6 +824,7 @@ struct sk_buff { - #ifdef CONFIG_TLS_DEVICE +@@ -826,6 +826,7 @@ struct sk_buff { __u8 decrypted:1; #endif + __u8 scm_io_uring:1; + __u8 gro_skip:1; #ifdef CONFIG_NET_SCHED |