diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-12-22 12:07:34 +0000 |
|---|---|---|
| committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2018-09-18 17:15:11 +0200 |
| commit | 69ff0b5709d0d06545fcb2d08c7645b56d3687dd (patch) | |
| tree | 71f1569cc019e16c1b1be22c1e8d382766daebb3 /net/bluetooth/rfcomm/sock.c | |
| parent | d6a47bfb72f495a72637fbe635220f6af0f4cb6f (diff) | |
backports: bluetooth: Support 4.9 kernels
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 90e1c3b..5d0b0a5 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -205,7 +205,7 @@ static void rfcomm_sock_kill(struct sock *sk) if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket) return; - BT_DBG("sk %p state %d refcnt %d", sk, sk->sk_state, refcount_read(&sk->sk_refcnt)); + BT_DBG("sk %p state %d refcnt %d", sk, sk->sk_state, refcount_read((const refcount_t *)&sk->sk_refcnt)); /* Kill poor orphan */ bt_sock_unlink(&rfcomm_sk_list, sk); @@ -481,8 +481,12 @@ done: return err; } +#if LINUX_VERSION_IS_LESS(4,12,0) +static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int flags) +#else static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int flags, bool kern) +#endif { DEFINE_WAIT_FUNC(wait, woken_wake_function); struct sock *sk = sock->sk, *nsk; @@ -542,7 +546,12 @@ done: return err; } +#if LINUX_VERSION_IS_LESS(4,17,0) +static int rfcomm_sock_getname(struct socket *sock, struct sockaddr *addr, + int *sockaddr_len, int peer) +#else static int rfcomm_sock_getname(struct socket *sock, struct sockaddr *addr, int peer) +#endif { struct sockaddr_rc *sa = (struct sockaddr_rc *) addr; struct sock *sk = sock->sk; |