diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-02-28 22:53:37 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-02 21:33:08 +0100 |
| commit | b5469b38cd68342db0a4c476aec9ad7a0c164027 (patch) | |
| tree | 62fe543196f822f4d396c335aa6ca4b5c590c187 /target/linux/generic/backport-4.14 | |
| parent | 844bdf94e42e967e35b71212cb9261fcb35e6aae (diff) | |
| download | upstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.tar.gz upstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.tar.bz2 upstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.zip | |
kernel: bump 4.14 to 4.14.23
This patch bumps the 4.14 kernel to .23.
- Refreshed patches.
- Deleted bcm53xx/patches-4.14/089-PCI-iproc-Fix-NULL-pointer-dereference-for-BCMA.patch. Has been accepted upstream.
- Deleted generic/pending-4.14/821-usb-Remove-annoying-warning-about-bogus-URB.patch. The upstream URB code was changed,
the patch no longer applies. I discussed this with the patch author and removed it for now, we'll see how it goes.
Compile-tested on: ramips/mt7621, x86/64
Run-tested on: ramips/mt7621, x86/64
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/generic/backport-4.14')
| -rw-r--r-- | target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch | 8 | ||||
| -rw-r--r-- | target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index 6c80eaa4be..03c0b53655 100644 --- a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -44,9 +44,9 @@ Cc: Kir Kolyshkin <kir@openvz.org> * @sk_lingertime: %SO_LINGER l_linger setting * @sk_backlog: always used with the per-socket spinlock held * @sk_callback_lock: used with the callbacks in the end of this struct -@@ -448,6 +449,8 @@ struct sock { - kmemcheck_bitfield_end(flags); - +@@ -445,6 +446,8 @@ struct sock { + sk_type : 16; + #define SK_PROTOCOL_MAX U8_MAX u16 sk_gso_max_segs; +#define sk_pacing_shift sk_pacing_shift /* for backport checks */ + u8 sk_pacing_shift; @@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org> rwlock_t sk_callback_lock; --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -2741,6 +2741,7 @@ void sock_init_data(struct socket *sock, +@@ -2739,6 +2739,7 @@ void sock_init_data(struct socket *sock, sk->sk_max_pacing_rate = ~0U; sk->sk_pacing_rate = ~0U; diff --git a/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch index 5bfa5aa833..45dfec1f00 100644 --- a/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch +++ b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch @@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c -@@ -819,6 +819,7 @@ static void clusterip_net_exit(struct ne +@@ -829,6 +829,7 @@ static void clusterip_net_exit(struct ne cn->procdir = NULL; #endif nf_unregister_net_hook(net, &cip_arp_ops); @@ -80,7 +80,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static void nfnl_queue_net_exit_batch(struct list_head *net_exit_list) --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c -@@ -1714,8 +1714,17 @@ static int __net_init xt_net_init(struct +@@ -1719,8 +1719,17 @@ static int __net_init xt_net_init(struct return 0; } |