Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
bluetooth
/
af_bluetooth.c
diff --git
a/kernel/net/bluetooth/af_bluetooth.c
b/kernel/net/bluetooth/af_bluetooth.c
index
70f9d94
..
70306cc
100644
(file)
--- a/
kernel/net/bluetooth/af_bluetooth.c
+++ b/
kernel/net/bluetooth/af_bluetooth.c
@@
-33,7
+33,7
@@
#include "selftest.h"
#include "selftest.h"
-#define VERSION "2.2
0
"
+#define VERSION "2.2
1
"
/* Bluetooth sockets */
#define BT_MAX_PROTO 8
/* Bluetooth sockets */
#define BT_MAX_PROTO 8
@@
-221,7
+221,7
@@
int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
BT_DBG("sock %p sk %p len %zu", sock, sk, len);
BT_DBG("sock %p sk %p len %zu", sock, sk, len);
- if (flags &
(MSG_OOB)
)
+ if (flags &
MSG_OOB
)
return -EOPNOTSUPP;
skb = skb_recv_datagram(sk, flags, noblock, &err);
return -EOPNOTSUPP;
skb = skb_recv_datagram(sk, flags, noblock, &err);
@@
-271,11
+271,11
@@
static long bt_sock_data_wait(struct sock *sk, long timeo)
if (signal_pending(current) || !timeo)
break;
if (signal_pending(current) || !timeo)
break;
- s
et_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags
);
+ s
k_set_bit(SOCKWQ_ASYNC_WAITDATA, sk
);
release_sock(sk);
timeo = schedule_timeout(timeo);
lock_sock(sk);
release_sock(sk);
timeo = schedule_timeout(timeo);
lock_sock(sk);
-
clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags
);
+
sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk
);
}
__set_current_state(TASK_RUNNING);
}
__set_current_state(TASK_RUNNING);
@@
-441,7
+441,7
@@
unsigned int bt_sock_poll(struct file *file, struct socket *sock,
if (!test_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags) && sock_writeable(sk))
mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
else
if (!test_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags) && sock_writeable(sk))
mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
else
- s
et_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags
);
+ s
k_set_bit(SOCKWQ_ASYNC_NOSPACE, sk
);
return mask;
}
return mask;
}