fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump to 4.9.253, 4.14.217, 4.19.170

Browse Source 
Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2021-01-24 02:47:59 +08:00
parent 015df15104
commit b01af9983b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
17 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/kernel-version.mk
View File

@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-4.9 = .252
LINUX_VERSION-4.14 = .216
LINUX_VERSION-4.19 = .169
LINUX_VERSION-4.9 = .253
LINUX_VERSION-4.14 = .217
LINUX_VERSION-4.19 = .170
LINUX_KERNEL_HASH-4.9.252 = 1c9edadf5e17540b01d95c879f42859d5f28ff577ff2ef6d56cdc45ef3a314ea
LINUX_KERNEL_HASH-4.14.216 = b7864fef15ca9bdefe38cd19232538e3387f05c6ace17f44a0da07bd71edbba5
LINUX_KERNEL_HASH-4.19.169 = c7d24ddb8ecc348ca7bed24111ff98e2a87f74666c8bbbf4f9c57b7c3c25de94
LINUX_KERNEL_HASH-4.9.253 = 9a5b51a8350201bd38e3ff13909323a6571b4572a7b3caed76e462b07619bc18
LINUX_KERNEL_HASH-4.14.217 = 62a36a25431016d98d0f1cff98be432086c51f86fd79042bd10a867b3a924d11
LINUX_KERNEL_HASH-4.19.170 = dd0d0264f8ef4363d0080054fd344470a73f07aca2cd673e91bf6e77fbe25b4a
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

2
target/linux/bcm27xx/patches-4.19/950-0676-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_online_cpu(i) {
struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
@@ -177,6 +182,26 @@ static int c_show(struct seq_file *m, vo
@@ -176,6 +181,26 @@ static int c_show(struct seq_file *m, vo
seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
}

4
target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
View File

@ -26,7 +26,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -381,7 +381,7 @@ static inline int ip6_forward_finish(str
@@ -419,7 +419,7 @@ static inline int ip6_forward_finish(str
return dst_output(net, sk, skb);
}
@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
{
unsigned int mtu;
struct inet6_dev *idev;
@@ -401,6 +401,7 @@ static unsigned int ip6_dst_mtu_forward(
@@ -439,6 +439,7 @@ static unsigned int ip6_dst_mtu_forward(
return mtu;
}

2
target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch
View File

@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -381,28 +381,6 @@ static inline int ip6_forward_finish(str
@@ -419,28 +419,6 @@ static inline int ip6_forward_finish(str
return dst_output(net, sk, skb);
}

2
target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
View File

@ -126,7 +126,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
pfmemalloc = nc->pfmemalloc;
local_irq_restore(flags);
@@ -509,7 +509,7 @@ struct sk_buff *__napi_alloc_skb(struct
@@ -514,7 +514,7 @@ struct sk_buff *__napi_alloc_skb(struct
if (sk_memalloc_socks())
gfp_mask |= __GFP_MEMALLOC;

2
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
View File

@ -960,7 +960,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
pasemi_mac_restart_tx_intr(mac);
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -2391,7 +2391,7 @@ static int netxen_nic_poll(struct napi_s
@@ -2386,7 +2386,7 @@ static int netxen_nic_poll(struct napi_s
work_done = budget;
if (work_done < budget) {

6
target/linux/generic/hack-4.14/721-phy_packets.patch
View File

@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2563,6 +2563,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2579,6 +2579,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@ -67,7 +67,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
@@ -2694,16 +2698,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2710,16 +2714,6 @@ static inline struct sk_buff *dev_alloc_
}
@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <net/protocol.h>
#include <net/dst.h>
@@ -584,6 +585,22 @@ skb_fail:
@@ -589,6 +590,22 @@ skb_fail:
}
EXPORT_SYMBOL(__napi_alloc_skb);

6
target/linux/generic/hack-4.19/721-phy_packets.patch
View File

@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2578,6 +2578,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2583,6 +2583,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@ -67,7 +67,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
@@ -2709,16 +2713,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2714,16 +2718,6 @@ static inline struct sk_buff *dev_alloc_
}
@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <net/protocol.h>
#include <net/dst.h>
@@ -555,6 +556,22 @@ skb_fail:
@@ -560,6 +561,22 @@ skb_fail:
}
EXPORT_SYMBOL(__napi_alloc_skb);

2
target/linux/generic/hack-4.9/721-phy_packets.patch
View File

@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <net/protocol.h>
#include <net/dst.h>
@@ -614,6 +615,22 @@ skb_fail:
@@ -619,6 +620,22 @@ skb_fail:
}
EXPORT_SYMBOL(__napi_alloc_skb);

8
target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch
View File

@ -1569,7 +1569,7 @@
extern struct kmem_cache *skbuff_head_cache;
void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
@@ -3860,8 +3879,12 @@ static inline void __nf_copy(struct sk_b
@@ -3876,8 +3895,12 @@ static inline void __nf_copy(struct sk_b
dst->_nfct = src->_nfct;
nf_conntrack_get(skb_nfct(src));
#endif
@ -1761,7 +1761,7 @@
/**
* skb_panic - private function for out-of-line support
@@ -615,6 +696,28 @@ void skb_release_head_state(struct sk_bu
@@ -620,6 +701,28 @@ void skb_release_head_state(struct sk_bu
WARN_ON(in_irq());
skb->destructor(skb);
}
@ -1790,7 +1790,7 @@
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
nf_conntrack_put(skb_nfct(skb));
#endif
@@ -804,6 +907,10 @@ static void __copy_skb_header(struct sk_
@@ -809,6 +912,10 @@ static void __copy_skb_header(struct sk_
new->sp = secpath_get(old->sp);
#endif
__nf_copy(new, old, false);
@ -1801,7 +1801,7 @@
/* Note : this field could be in headers_start/headers_end section
* It is not yet because we do not want to have a 16 bit hole
@@ -3949,6 +4056,13 @@ void __init skb_init(void)
@@ -3954,6 +4061,13 @@ void __init skb_init(void)
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);

2
target/linux/generic/pending-4.14/655-increase_skb_pad.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2527,7 +2527,7 @@ static inline int pskb_network_may_pull(
@@ -2543,7 +2543,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

2
target/linux/generic/pending-4.14/760-net-usb-aqc111-Driver-skeleton-for-Aquantia-AQtionUSB-to-5GbE.patch
View File

@ -1856,7 +1856,7 @@
static const struct usb_device_id products[] = {
/* BLACKLIST !!
@@ -842,6 +844,30 @@ static const struct usb_device_id produc
@@ -849,6 +851,30 @@ static const struct usb_device_id produc
.driver_info = 0,
},

8
target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch
View File

@ -1264,7 +1264,7 @@
extern struct kmem_cache *skbuff_head_cache;
void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
@@ -3935,8 +3954,12 @@ static inline void __nf_copy(struct sk_b
@@ -3940,8 +3959,12 @@ static inline void __nf_copy(struct sk_b
dst->_nfct = src->_nfct;
nf_conntrack_get(skb_nfct(src));
#endif
@ -1427,7 +1427,7 @@
/**
* skb_panic - private function for out-of-line support
@@ -615,6 +667,28 @@ void skb_release_head_state(struct sk_bu
@@ -620,6 +672,28 @@ void skb_release_head_state(struct sk_bu
WARN_ON(in_irq());
skb->destructor(skb);
}
@ -1456,7 +1456,7 @@
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
nf_conntrack_put(skb_nfct(skb));
#endif
@@ -804,6 +878,9 @@ static void __copy_skb_header(struct sk_
@@ -809,6 +883,9 @@ static void __copy_skb_header(struct sk_
new->sp = secpath_get(old->sp);
#endif
__nf_copy(new, old, false);
@ -1466,7 +1466,7 @@
/* Note : this field could be in headers_start/headers_end section
* It is not yet because we do not want to have a 16 bit hole
@@ -3975,6 +4052,13 @@ void __init skb_init(void)
@@ -3980,6 +4057,13 @@ void __init skb_init(void)
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);

2
target/linux/generic/pending-4.19/655-increase_skb_pad.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2542,7 +2542,7 @@ static inline int pskb_network_may_pull(
@@ -2547,7 +2547,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

6
target/linux/generic/pending-4.9/601-add-kernel-imq-support.patch
View File

@ -1714,7 +1714,7 @@
/**
* skb_panic - private function for out-of-line support
@@ -658,6 +739,28 @@ static void skb_release_head_state(struc
@@ -663,6 +744,28 @@ static void skb_release_head_state(struc
WARN_ON(in_irq());
skb->destructor(skb);
}
@ -1743,7 +1743,7 @@
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
nf_conntrack_put(skb->nfct);
#endif
@@ -847,6 +950,10 @@ static void __copy_skb_header(struct sk_
@@ -852,6 +955,10 @@ static void __copy_skb_header(struct sk_
new->sp = secpath_get(old->sp);
#endif
__nf_copy(new, old, false);
@ -1754,7 +1754,7 @@
/* Note : this field could be in headers_start/headers_end section
* It is not yet because we do not want to have a 16 bit hole
@@ -3527,6 +3634,13 @@ void __init skb_init(void)
@@ -3532,6 +3639,13 @@ void __init skb_init(void)
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);

2
target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch
View File

@ -10,7 +10,7 @@
/* Get the HEAD */
skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
@@ -1335,6 +1338,10 @@ int pskb_expand_head(struct sk_buff *skb
@@ -1340,6 +1343,10 @@ int pskb_expand_head(struct sk_buff *skb
if (skb_shared(skb))
BUG();

8
target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
View File

@ -580,7 +580,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
void __kfree_skb(struct sk_buff *skb);
#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
@@ -3350,6 +3351,7 @@ static inline void skb_free_datagram_loc
@@ -3366,6 +3367,7 @@ static inline void skb_free_datagram_loc
}
int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags);
int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len);
@ -837,7 +837,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -906,6 +906,32 @@ void napi_consume_skb(struct sk_buff *sk
@@ -911,6 +911,32 @@ void napi_consume_skb(struct sk_buff *sk
}
EXPORT_SYMBOL(napi_consume_skb);
@ -870,7 +870,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
/* Make sure a field is enclosed inside headers_start/headers_end section */
#define CHECK_SKB_FIELD(field) \
BUILD_BUG_ON(offsetof(struct sk_buff, field) < \
@@ -1429,7 +1455,7 @@ static void skb_headers_offset_update(st
@@ -1434,7 +1460,7 @@ static void skb_headers_offset_update(st
skb->inner_mac_header += off;
}
@ -879,7 +879,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
{
__copy_skb_header(new, old);
@@ -1437,6 +1463,7 @@ static void copy_skb_header(struct sk_bu
@@ -1442,6 +1468,7 @@ static void copy_skb_header(struct sk_bu
skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type;
}