diff options
| author | John Audia <graysky@archlinux.us> | 2021-01-23 11:09:03 -0500 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-01-26 00:49:53 +0100 |
| commit | 9ad912d159f8a6a2907d6cd6c55082765ba2364b (patch) | |
| tree | b8ad5bf9c59c9b4ce719a880ca4166d88916bae3 /target/linux/generic | |
| parent | 23be333401f06a49d7081b051b2cdf84f8a75149 (diff) | |
| download | upstream-9ad912d159f8a6a2907d6cd6c55082765ba2364b.tar.gz upstream-9ad912d159f8a6a2907d6cd6c55082765ba2364b.tar.bz2 upstream-9ad912d159f8a6a2907d6cd6c55082765ba2364b.zip | |
kernel: bump 5.4 to 5.4.92
All modification made by update_kernel.sh in a fresh clone without
existing toolchains.
Build system: x86_64
Build-tested: ipq806x/R7800, bcm27xx/bcm2711
Run-tested: ipq806x/R7800
Compile-tested [*]: ath79/{tiny,generic}, ipq40xx, octeon,
ramips/mt7621, realtek, x86/64.
Run-tested [*]: ath79/generic, octeon, ramips/mt7621, realtek.
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Stijn Segers <foss@volatilesystems.org> [*]
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/hack-5.4/721-phy_packets.patch | 6 | ||||
| -rw-r--r-- | target/linux/generic/pending-5.4/655-increase_skb_pad.patch | 2 |
2 files changed, 4 insertions, 4 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 407597c896..dba648f8e6 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 -@@ -2679,6 +2679,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2684,6 +2684,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 -@@ -2810,16 +2814,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2815,16 +2819,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <net/protocol.h> #include <net/dst.h> -@@ -540,6 +541,22 @@ skb_fail: +@@ -545,6 +546,22 @@ skb_fail: } EXPORT_SYMBOL(__napi_alloc_skb); 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 f7ab7e492f..e325301d3c 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 -@@ -2645,7 +2645,7 @@ static inline int pskb_network_may_pull( +@@ -2650,7 +2650,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 |