| Message ID | 20220314224252.3166367-1-gavin@matician.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f09ab95cfdb43a17dc97dd124b5a0b445a65086b |
| Headers | show |
| Series | [v2] Bluetooth: fix incorrect nonblock bitmask in bt_sock_wait_ready() | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/checkpatch | success | Checkpatch PASS |
| tedd_an/gitlint | success | Gitlint PASS |
| tedd_an/subjectprefix | success | PASS |
| tedd_an/buildkernel | success | Build Kernel PASS |
| tedd_an/buildkernel32 | success | Build Kernel32 PASS |
| tedd_an/incremental_build | success | Pass |
| tedd_an/testrunnersetup | success | Test Runner Setup PASS |
| tedd_an/testrunnerl2cap-tester | success | Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnerbnep-tester | success | Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnermgmt-tester | success | Total: 493, Passed: 493 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnerrfcomm-tester | success | Total: 10, Passed: 10 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnersco-tester | success | Total: 12, Passed: 12 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnersmp-tester | success | Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunneruserchan-tester | success | Total: 4, Passed: 4 (100.0%), Failed: 0, Not Run: 0 |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=623339 ---Test result--- Test Summary: CheckPatch PASS 1.85 seconds GitLint PASS 1.04 seconds SubjectPrefix PASS 0.92 seconds BuildKernel PASS 31.27 seconds BuildKernel32 PASS 27.91 seconds Incremental Build with patchesPASS 38.17 seconds TestRunner: Setup PASS 478.89 seconds TestRunner: l2cap-tester PASS 15.81 seconds TestRunner: bnep-tester PASS 6.20 seconds TestRunner: mgmt-tester PASS 101.58 seconds TestRunner: rfcomm-tester PASS 8.03 seconds TestRunner: sco-tester PASS 7.81 seconds TestRunner: smp-tester PASS 7.77 seconds TestRunner: userchan-tester PASS 5.91 seconds --- Regards, Linux Bluetooth
Hi Gavin, > Callers pass msg->msg_flags as flags, which contains MSG_DONTWAIT > instead of O_NONBLOCK. > > Signed-off-by: Gavin Li <gavin@matician.com> > --- > include/net/bluetooth/bluetooth.h | 2 +- > net/bluetooth/af_bluetooth.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) patch has been applied to bluetooth-next tree. Regards Marcel
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Marcel Holtmann <marcel@holtmann.org>: On Mon, 14 Mar 2022 15:42:52 -0700 you wrote: > From: Gavin Li <gavin@matician.com> > > Callers pass msg->msg_flags as flags, which contains MSG_DONTWAIT > instead of O_NONBLOCK. > > Signed-off-by: Gavin Li <gavin@matician.com> > > [...] Here is the summary with links: - [v2] Bluetooth: fix incorrect nonblock bitmask in bt_sock_wait_ready() https://git.kernel.org/bluetooth/bluetooth-next/c/f09ab95cfdb4 You are awesome, thank you!
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index a647e5fabdbd6..59f6e7675554e 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -343,7 +343,7 @@ int bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg, __poll_t bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait); int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo); -int bt_sock_wait_ready(struct sock *sk, unsigned long flags); +int bt_sock_wait_ready(struct sock *sk, unsigned int msg_flags); void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh); void bt_accept_unlink(struct sock *sk); diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index ee319779781e6..a0cb2e3da8d4c 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -568,7 +568,7 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo) EXPORT_SYMBOL(bt_sock_wait_state); /* This function expects the sk lock to be held when called */ -int bt_sock_wait_ready(struct sock *sk, unsigned long flags) +int bt_sock_wait_ready(struct sock *sk, unsigned int msg_flags) { DECLARE_WAITQUEUE(wait, current); unsigned long timeo; @@ -576,7 +576,7 @@ int bt_sock_wait_ready(struct sock *sk, unsigned long flags) BT_DBG("sk %p", sk); - timeo = sock_sndtimeo(sk, flags & O_NONBLOCK); + timeo = sock_sndtimeo(sk, !!(msg_flags & MSG_DONTWAIT)); add_wait_queue(sk_sleep(sk), &wait); set_current_state(TASK_INTERRUPTIBLE);