diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-08-22 00:28:14 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-06 17:06:17 +0200 |
| commit | 19ea0bb944916b65042ec5206a5b8e89574b0a31 (patch) | |
| tree | ed6bab6503a554d0843257b703dbdbf3a5f27131 /patches | |
| parent | 47abd7725f20edce619d9738130f709609ba6322 (diff) | |
patches: adapt signature of proto_ops->accept
In commit cdfbabfb2f0ce ("net: Work around lockdep limitation in sockets
that use sockets") a extra parameter was added to proto_ops->accept(),
do not assume it on older kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0081-proto_ops-accept/nfc.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/patches/0081-proto_ops-accept/nfc.patch b/patches/0081-proto_ops-accept/nfc.patch new file mode 100644 index 00000000..decd13a8 --- /dev/null +++ b/patches/0081-proto_ops-accept/nfc.patch @@ -0,0 +1,16 @@ +diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c +index 043c6d3..5b4e44c 100644 +--- a/net/nfc/llcp_sock.c ++++ b/net/nfc/llcp_sock.c +@@ -443,7 +443,11 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *parent, + } + + static int llcp_sock_accept(struct socket *sock, struct socket *newsock, ++#if LINUX_VERSION_IS_GEQ(4,11,0) + int flags, bool kern) ++#else ++ int flags) ++#endif + { + DECLARE_WAITQUEUE(wait, current); + struct sock *sk = sock->sk, *new_sk; |