aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-12-14 10:13:21 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-12-14 23:37:28 +0100
commit90120a1552ba5e55c4a03aca1920831116ab50a9 (patch)
tree2823d5f961ae7ad43c705436028c1a069e760184 /target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
parentb6fa423907f7e09a173407fd9e9c91ccd907a91d (diff)
downloadupstream-90120a1552ba5e55c4a03aca1920831116ab50a9.tar.gz
upstream-90120a1552ba5e55c4a03aca1920831116ab50a9.tar.bz2
upstream-90120a1552ba5e55c4a03aca1920831116ab50a9.zip
kernel: bump 5.10 to 5.10.159
Removed upstreamed: backport-5.10/888-v6.1-ca8210-Fix-crash-by-zero-initializing-data.patch[1] All patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.159&id=0a8e66e375736ea12c11f0ef238ba2a8efec460b 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>
Diffstat (limited to 'target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch')
-rw-r--r--target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch b/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
index ab4fdf8509..51f87904ef 100644
--- a/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
+++ b/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
@@ -82,9 +82,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
memmove(skb->data - ETH_HLEN,
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
-@@ -24,7 +24,7 @@ static struct sk_buff *ksz_common_rcv(st
-
- pskb_trim_rcsum(skb, skb->len - len);
+@@ -25,7 +25,7 @@ static struct sk_buff *ksz_common_rcv(st
+ if (pskb_trim_rcsum(skb, skb->len - len))
+ return NULL;
- skb->offload_fwd_mark = true;
+ dsa_default_offload_fwd_mark(skb);