aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.4
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-11-13 00:44:25 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-13 01:06:12 +0100
commit079ce0413a1e3c19dd00be1b90de737c2bc09223 (patch)
tree2b8a95a2775fc260023e5637b70642ac7ba277ce /target/linux/generic/hack-5.4
parentdec6584b22bad48fb0f21904bc552697360005b0 (diff)
downloadupstream-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/hack-5.4')
-rw-r--r--target/linux/generic/hack-5.4/721-phy_packets.patch4
1 files changed, 2 insertions, 2 deletions
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 dfc9aa595a..f9fa50b299 100644
--- a/target/linux/generic/hack-5.4/721-phy_packets.patch
+++ b/target/linux/generic/hack-5.4/721-phy_packets.patch
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2692,6 +2692,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2694,6 +2694,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
-@@ -2823,16 +2827,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2825,16 +2829,6 @@ static inline struct sk_buff *dev_alloc_
}