From fa802da5587e50e9fd0d6b557fbedf4ce03172fa Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 21 Nov 2020 21:15:35 +0800 Subject: [PATCH] kernel: bump to 4.9.244, 4.14.207, 4.19.158 Resolve conflicted: - ath79/patches-4.19/910-unaligned_access_hacks.patch Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 12 ++++++------ .../patches-4.19/910-unaligned_access_hacks.patch | 2 +- .../090-net-generalize-napi_complete_done.patch | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 2d133b4b99..f88162e8a1 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .243 -LINUX_VERSION-4.14 = .206 -LINUX_VERSION-4.19 = .157 +LINUX_VERSION-4.9 = .244 +LINUX_VERSION-4.14 = .207 +LINUX_VERSION-4.19 = .158 -LINUX_KERNEL_HASH-4.9.243 = d3aa189ca7fcc6e52d6c0333a0d7acd8789e9a492b32dbf9476e926ffaa73984 -LINUX_KERNEL_HASH-4.14.206 = 1c233efaa5063983293a02d4692acc9ced9c03e18857364855d4f612347086ac -LINUX_KERNEL_HASH-4.19.157 = 76dca365255c1a13778c3b24f0eae14f4e66bc12fe79f5e6592b116fc57ef755 +LINUX_KERNEL_HASH-4.9.244 = 997af5a1558dd72ce49b87bf710359ad1fca5af777616a8baa98000f6edff109 +LINUX_KERNEL_HASH-4.14.207 = 78a753970d98584da0821147d4ee7d469325464cb664fb446b8bb30339240029 +LINUX_KERNEL_HASH-4.19.158 = d658e4b13f796a370da27c868c69c2d6f6edf7eab4cda0c2b44cb31f538db75c remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index a509f4f82d..5656507367 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -886,6 +886,6 @@ ipv6_hdr(skb)->hop_limit != hop_limit || - flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) { + flowlabel != net_hdr_word(ipv6_hdr(skb)))) { - err = ip6_route_me_harder(state->net, skb); + err = ip6_route_me_harder(state->net, state->sk, skb); if (err < 0) ret = NF_DROP_ERR(err); diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 6ee4d3dc5d..6a52187163 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -1368,7 +1368,7 @@ Signed-off-by: David S. Miller } --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c -@@ -104,7 +104,7 @@ static int xenvif_poll(struct napi_struc +@@ -120,7 +120,7 @@ static int xenvif_poll(struct napi_struc work_done = xenvif_tx_action(queue, budget); if (work_done < budget) {