aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2023-01-27 11:40:46 +0100
committerFelix Fietkau <nbd@nbd.name>2023-01-29 10:08:21 +0100
commit638283d481a15769ba60ae42f11c6603f6c2dd11 (patch)
treeef950310d6068beb2e99d6eb46afdc3732d13178 /target/linux/generic/pending-5.10
parent908397f6d2d167c02ee579b51c79ef03cdcdae9c (diff)
downloadupstream-638283d481a15769ba60ae42f11c6603f6c2dd11.tar.gz
upstream-638283d481a15769ba60ae42f11c6603f6c2dd11.tar.bz2
upstream-638283d481a15769ba60ae42f11c6603f6c2dd11.zip
kernel: backport page pool fragment support from v5.15
Required for an upcoming mt76 update Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-5.10')
-rw-r--r--target/linux/generic/pending-5.10/655-increase_skb_pad.patch2
-rw-r--r--target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/655-increase_skb_pad.patch b/target/linux/generic/pending-5.10/655-increase_skb_pad.patch
index 3655f75a5c..0b25a76416 100644
--- a/target/linux/generic/pending-5.10/655-increase_skb_pad.patch
+++ b/target/linux/generic/pending-5.10/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
-@@ -2691,7 +2691,7 @@ static inline int pskb_network_may_pull(
+@@ -2693,7 +2693,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.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index f1fc063a45..10f5c9b9c6 100644
--- a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -861,6 +861,7 @@ struct sk_buff {
+@@ -863,6 +863,7 @@ struct sk_buff {
__u8 decrypted:1;
#endif
__u8 scm_io_uring:1;