aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-02-06 06:28:36 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2023-02-08 00:22:58 +0100
commit712681458a65736d3fc625bb9c481c31b23c1f97 (patch)
treee8ff0bdd1fe8154109be71b2ef6fd76e703b8603
parent64cf31f6ff5b35bc1bc6e4c87779a3a6c60b7103 (diff)
downloadupstream-712681458a65736d3fc625bb9c481c31b23c1f97.tar.gz
upstream-712681458a65736d3fc625bb9c481c31b23c1f97.tar.bz2
upstream-712681458a65736d3fc625bb9c481c31b23c1f97.zip
kernel: bump 5.10 to 5.10.167
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
-rw-r--r--include/kernel-5.104
-rw-r--r--target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch2
-rw-r--r--target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/kernel-5.10 b/include/kernel-5.10
index 0c14e6b582..0198540361 100644
--- a/include/kernel-5.10
+++ b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .166
-LINUX_KERNEL_HASH-5.10.166 = 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af
+LINUX_VERSION-5.10 = .167
+LINUX_KERNEL_HASH-5.10.167 = d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6
diff --git a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
index dbcdac8590..340a02afa7 100644
--- a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
+++ b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
@@ -646,7 +646,7 @@
}
/* Reposition in the original skb */
-@@ -5189,6 +5210,20 @@ bool skb_try_coalesce(struct sk_buff *to
+@@ -5188,6 +5209,20 @@ bool skb_try_coalesce(struct sk_buff *to
if (skb_cloned(to))
return false;
diff --git a/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch b/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
index 5a145abed3..c464b8e7ff 100644
--- a/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
+++ b/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
@@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -4166,6 +4166,15 @@ int skb_gro_receive(struct sk_buff *p, s
+@@ -4165,6 +4165,15 @@ int skb_gro_receive(struct sk_buff *p, s
if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush))
return -E2BIG;