diff options
author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-05-29 00:10:44 +0300 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-05-29 00:53:15 +0300 |
commit | 64b53247c494898eaa78090fbc0a0727fce055d2 (patch) | |
tree | 097f1bf24fd6593244f9de7125751d802a2ef3e2 /target/linux/generic/hack-4.14 | |
parent | f4a639a3d7d40b4f63c431c2d554c479fbcc6b74 (diff) | |
download | upstream-64b53247c494898eaa78090fbc0a0727fce055d2.tar.gz upstream-64b53247c494898eaa78090fbc0a0727fce055d2.tar.bz2 upstream-64b53247c494898eaa78090fbc0a0727fce055d2.zip |
kernel: bump 4.14 to 4.14.44
Refresh patches.
Remove upstreamed patch:
generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch
Update patches that no longer applies:
generic/hack/901-debloat_sock_diag.patch
Compile-tested on: x86/64.
Runtime-tested on: x86/64.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/hack-4.14')
-rw-r--r-- | target/linux/generic/hack-4.14/901-debloat_sock_diag.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch index 29071d63c9..d250843a6a 100644 --- a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch @@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static void __sk_free(struct sock *sk) { +#ifdef CONFIG_SOCK_DIAG - if (unlikely(sock_diag_has_destroy_listeners(sk) && sk->sk_net_refcnt)) + if (unlikely(sk->sk_net_refcnt && sock_diag_has_destroy_listeners(sk))) sock_diag_broadcast_destroy(sk); else +#endif |