aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-04-29 07:22:29 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-04-30 00:02:47 +0200
commit45f5115253362c82296eb212742381e90199b3ef (patch)
tree29cd006a418ccc391a4e34adeb9da3dab4a54f12 /target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch
parent80c1105b0339516344f12364a599070ab1c9a41a (diff)
downloadupstream-45f5115253362c82296eb212742381e90199b3ef.tar.gz
upstream-45f5115253362c82296eb212742381e90199b3ef.tar.bz2
upstream-45f5115253362c82296eb212742381e90199b3ef.zip
kernel: bump 5.15 to 5.15.109
Removed upstreamed: backport-5.15/743-v6.3-0005-net-dsa-b53-mmap-add-phy-ops.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.109&id=357fa038d93d0e9159a0f0d45bae0f8654e2ade5 Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch')
-rw-r--r--target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch
index 16bb4855ff..dbdb141c6d 100644
--- a/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch
+++ b/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch
@@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2854,6 +2854,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2855,6 +2855,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@@ -82,7 +82,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
-@@ -3004,16 +3008,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -3005,16 +3009,6 @@ static inline struct sk_buff *dev_alloc_
}