* [PATCH v2 0/2] Fix stop discovery not handled if discovery state is STARTING @ 2012-12-21 12:50 Jaganath Kanakkassery 2012-12-21 12:50 ` [PATCH v2 1/2] Bluetooth: Move discovery state check inside hci_dev_lock() Jaganath Kanakkassery 2012-12-21 12:50 ` [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state Jaganath Kanakkassery 0 siblings, 2 replies; 6+ messages in thread From: Jaganath Kanakkassery @ 2012-12-21 12:50 UTC (permalink / raw) To: linux-bluetooth; +Cc: Jaganath Kanakkassery If user calls stop_discovery when the discovery state is STARTING, then it fails. In this scenario discovery will continue. This patch handles stop_discovery even if state is STARTING v2---> Incorporated Gustavo's comments Jaganath Kanakkassery (2): Bluetooth: Move discovery state check inside hci_dev_lock() Bluetooth: Fix stop discovery while in STARTING state include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_event.c | 23 ++++++++++++++++------- net/bluetooth/mgmt.c | 35 ++++++++++++++++++++++++++++++----- 3 files changed, 48 insertions(+), 12 deletions(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] Bluetooth: Move discovery state check inside hci_dev_lock() 2012-12-21 12:50 [PATCH v2 0/2] Fix stop discovery not handled if discovery state is STARTING Jaganath Kanakkassery @ 2012-12-21 12:50 ` Jaganath Kanakkassery 2012-12-21 12:50 ` [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state Jaganath Kanakkassery 1 sibling, 0 replies; 6+ messages in thread From: Jaganath Kanakkassery @ 2012-12-21 12:50 UTC (permalink / raw) To: linux-bluetooth; +Cc: Jaganath Kanakkassery After checking the discovery state, if other thread modifies it then it will be overwritten by the assignment in the first thread. Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com> --- net/bluetooth/hci_event.c | 9 ++++----- net/bluetooth/mgmt.c | 4 ---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 9fb656b..e248e7c 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1106,14 +1106,13 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, clear_bit(HCI_LE_SCAN, &hdev->dev_flags); + hci_dev_lock(hdev); if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED && - hdev->discovery.state == DISCOVERY_FINDING) { + hdev->discovery.state == DISCOVERY_FINDING) mgmt_interleaved_discovery(hdev); - } else { - hci_dev_lock(hdev); + else hci_discovery_set_state(hdev, DISCOVERY_STOPPED); - hci_dev_unlock(hdev); - } + hci_dev_unlock(hdev); break; diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 729fb8c..d6c0d78 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -2289,14 +2289,10 @@ int mgmt_interleaved_discovery(struct hci_dev *hdev) BT_DBG("%s", hdev->name); - hci_dev_lock(hdev); - err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR_LE); if (err < 0) hci_discovery_set_state(hdev, DISCOVERY_STOPPED); - hci_dev_unlock(hdev); - return err; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state 2012-12-21 12:50 [PATCH v2 0/2] Fix stop discovery not handled if discovery state is STARTING Jaganath Kanakkassery 2012-12-21 12:50 ` [PATCH v2 1/2] Bluetooth: Move discovery state check inside hci_dev_lock() Jaganath Kanakkassery @ 2012-12-21 12:50 ` Jaganath Kanakkassery 2013-01-03 19:38 ` Gustavo Padovan 1 sibling, 1 reply; 6+ messages in thread From: Jaganath Kanakkassery @ 2012-12-21 12:50 UTC (permalink / raw) To: linux-bluetooth; +Cc: Jaganath Kanakkassery If stop_discovery() is called when discovery state is STARTING, it will be failed currently. This patch fixes this. Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com> --- include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_event.c | 14 ++++++++++++-- net/bluetooth/mgmt.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 119fcb6..c2886b7 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -64,6 +64,7 @@ struct discovery_state { DISCOVERY_RESOLVING, DISCOVERY_STOPPING, } state; + u8 discovering; struct list_head all; /* All devices found during inquiry */ struct list_head unknown; /* Name state not known */ struct list_head resolve; /* Name needs to be resolved */ @@ -1066,6 +1067,7 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, u8 addr_type, s8 rssi, u8 *name, u8 name_len); int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); +int mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status); int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status); int mgmt_discovering(struct hci_dev *hdev, u8 discovering); int mgmt_interleaved_discovery(struct hci_dev *hdev); diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index e248e7c..b486458 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1092,7 +1092,12 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, set_bit(HCI_LE_SCAN, &hdev->dev_flags); hci_dev_lock(hdev); - hci_discovery_set_state(hdev, DISCOVERY_FINDING); + if (hdev->discovery.state == DISCOVERY_STOPPING) { + hci_cancel_le_scan(hdev); + mgmt_start_discovery_complete(hdev, 0); + } else { + hci_discovery_set_state(hdev, DISCOVERY_FINDING); + } hci_dev_unlock(hdev); break; @@ -1189,7 +1194,12 @@ static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) set_bit(HCI_INQUIRY, &hdev->flags); hci_dev_lock(hdev); - hci_discovery_set_state(hdev, DISCOVERY_FINDING); + if (hdev->discovery.state == DISCOVERY_STOPPING) { + hci_cancel_inquiry(hdev); + mgmt_start_discovery_complete(hdev, 0); + } else { + hci_discovery_set_state(hdev, DISCOVERY_FINDING); + } hci_dev_unlock(hdev); } diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index d6c0d78..ba4171f 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -2385,7 +2385,8 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data, hci_dev_lock(hdev); - if (!hci_discovery_active(hdev)) { + if (hdev->discovery.state != DISCOVERY_STARTING && + !hci_discovery_active(hdev)) { err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY, MGMT_STATUS_REJECTED, &mgmt_cp->type, sizeof(mgmt_cp->type)); @@ -2433,6 +2434,10 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data, break; + case DISCOVERY_STARTING: + err = 0; + break; + default: BT_DBG("unknown discovery state %u", hdev->discovery.state); err = -EFAULT; @@ -3624,6 +3629,25 @@ int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status) return err; } +int mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status) +{ + struct pending_cmd *cmd; + u8 type; + int err; + + cmd = mgmt_pending_find(MGMT_OP_START_DISCOVERY, hdev); + if (!cmd) + return -ENOENT; + + type = hdev->discovery.type; + + err = cmd_complete(cmd->sk, hdev->id, cmd->opcode, mgmt_status(status), + &type, sizeof(type)); + mgmt_pending_remove(cmd); + + return err; +} + int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status) { struct pending_cmd *cmd; @@ -3660,6 +3684,11 @@ int mgmt_discovering(struct hci_dev *hdev, u8 discovering) mgmt_pending_remove(cmd); } + if (hdev->discovery.discovering == discovering) + return 0; + + hdev->discovery.discovering = discovering; + memset(&ev, 0, sizeof(ev)); ev.type = hdev->discovery.type; ev.discovering = discovering; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state 2012-12-21 12:50 ` [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state Jaganath Kanakkassery @ 2013-01-03 19:38 ` Gustavo Padovan 2013-01-04 7:46 ` Jaganath Kanakkassery 0 siblings, 1 reply; 6+ messages in thread From: Gustavo Padovan @ 2013-01-03 19:38 UTC (permalink / raw) To: Jaganath Kanakkassery; +Cc: linux-bluetooth Hi Jaganath, * Jaganath Kanakkassery <jaganath.k@samsung.com> [2012-12-21 18:20:25 +0530]: > If stop_discovery() is called when discovery state is STARTING, it > will be failed currently. This patch fixes this. > > Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com> > --- > include/net/bluetooth/hci_core.h | 2 ++ > net/bluetooth/hci_event.c | 14 ++++++++++++-- > net/bluetooth/mgmt.c | 31 ++++++++++++++++++++++++++++++- > 3 files changed, 44 insertions(+), 3 deletions(-) > > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > index 119fcb6..c2886b7 100644 > --- a/include/net/bluetooth/hci_core.h > +++ b/include/net/bluetooth/hci_core.h > @@ -64,6 +64,7 @@ struct discovery_state { > DISCOVERY_RESOLVING, > DISCOVERY_STOPPING, > } state; > + u8 discovering; > struct list_head all; /* All devices found during inquiry */ > struct list_head unknown; /* Name state not known */ > struct list_head resolve; /* Name needs to be resolved */ > @@ -1066,6 +1067,7 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, > int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, > u8 addr_type, s8 rssi, u8 *name, u8 name_len); > int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); > +int mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status); > int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status); > int mgmt_discovering(struct hci_dev *hdev, u8 discovering); > int mgmt_interleaved_discovery(struct hci_dev *hdev); > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index e248e7c..b486458 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -1092,7 +1092,12 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, > set_bit(HCI_LE_SCAN, &hdev->dev_flags); > > hci_dev_lock(hdev); > - hci_discovery_set_state(hdev, DISCOVERY_FINDING); > + if (hdev->discovery.state == DISCOVERY_STOPPING) { > + hci_cancel_le_scan(hdev); > + mgmt_start_discovery_complete(hdev, 0); Reply to mgmt with an error here might be better. > + } else { > + hci_discovery_set_state(hdev, DISCOVERY_FINDING); > + } > hci_dev_unlock(hdev); > break; > > @@ -1189,7 +1194,12 @@ static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) > set_bit(HCI_INQUIRY, &hdev->flags); > > hci_dev_lock(hdev); > - hci_discovery_set_state(hdev, DISCOVERY_FINDING); > + if (hdev->discovery.state == DISCOVERY_STOPPING) { > + hci_cancel_inquiry(hdev); > + mgmt_start_discovery_complete(hdev, 0); > + } else { > + hci_discovery_set_state(hdev, DISCOVERY_FINDING); > + } > hci_dev_unlock(hdev); > } > > diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c > index d6c0d78..ba4171f 100644 > --- a/net/bluetooth/mgmt.c > +++ b/net/bluetooth/mgmt.c > @@ -2385,7 +2385,8 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data, > > hci_dev_lock(hdev); > > - if (!hci_discovery_active(hdev)) { > + if (hdev->discovery.state != DISCOVERY_STARTING && > + !hci_discovery_active(hdev)) { > err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY, > MGMT_STATUS_REJECTED, &mgmt_cp->type, > sizeof(mgmt_cp->type)); > @@ -2433,6 +2434,10 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data, > > break; > > + case DISCOVERY_STARTING: > + err = 0; > + break; > + > default: > BT_DBG("unknown discovery state %u", hdev->discovery.state); > err = -EFAULT; > @@ -3624,6 +3629,25 @@ int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status) > return err; > } > > +int mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status) > +{ > + struct pending_cmd *cmd; > + u8 type; > + int err; > + > + cmd = mgmt_pending_find(MGMT_OP_START_DISCOVERY, hdev); > + if (!cmd) > + return -ENOENT; > + > + type = hdev->discovery.type; > + > + err = cmd_complete(cmd->sk, hdev->id, cmd->opcode, mgmt_status(status), > + &type, sizeof(type)); > + mgmt_pending_remove(cmd); > + > + return err; > +} This is exactly the same thing as mgmt_start_discovery_failed(), just rename it to _complete() as you did with mgmt_stop_discovery_failed(). Do it as a separate patch. Gustavo ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state 2013-01-03 19:38 ` Gustavo Padovan @ 2013-01-04 7:46 ` Jaganath Kanakkassery 2013-01-09 21:37 ` Gustavo Padovan 0 siblings, 1 reply; 6+ messages in thread From: Jaganath Kanakkassery @ 2013-01-04 7:46 UTC (permalink / raw) To: Gustavo Padovan; +Cc: linux-bluetooth Hi Gustavo, -------------------------------------------------- From: "Gustavo Padovan" <gustavo@padovan.org> Sent: Friday, January 04, 2013 1:08 AM To: "Jaganath Kanakkassery" <jaganath.k@samsung.com> Cc: <linux-bluetooth@vger.kernel.org> Subject: Re: [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state > Hi Jaganath, > > * Jaganath Kanakkassery <jaganath.k@samsung.com> [2012-12-21 18:20:25 > +0530]: > >> If stop_discovery() is called when discovery state is STARTING, it >> will be failed currently. This patch fixes this. >> >> Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com> >> --- >> include/net/bluetooth/hci_core.h | 2 ++ >> net/bluetooth/hci_event.c | 14 ++++++++++++-- >> net/bluetooth/mgmt.c | 31 ++++++++++++++++++++++++++++++- >> 3 files changed, 44 insertions(+), 3 deletions(-) >> >> diff --git a/include/net/bluetooth/hci_core.h >> b/include/net/bluetooth/hci_core.h >> index 119fcb6..c2886b7 100644 >> --- a/include/net/bluetooth/hci_core.h >> +++ b/include/net/bluetooth/hci_core.h >> @@ -64,6 +64,7 @@ struct discovery_state { >> DISCOVERY_RESOLVING, >> DISCOVERY_STOPPING, >> } state; >> + u8 discovering; >> struct list_head all; /* All devices found during inquiry */ >> struct list_head unknown; /* Name state not known */ >> struct list_head resolve; /* Name needs to be resolved */ >> @@ -1066,6 +1067,7 @@ int mgmt_device_found(struct hci_dev *hdev, >> bdaddr_t *bdaddr, u8 link_type, >> int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 >> link_type, >> u8 addr_type, s8 rssi, u8 *name, u8 name_len); >> int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); >> +int mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status); >> int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status); >> int mgmt_discovering(struct hci_dev *hdev, u8 discovering); >> int mgmt_interleaved_discovery(struct hci_dev *hdev); >> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c >> index e248e7c..b486458 100644 >> --- a/net/bluetooth/hci_event.c >> +++ b/net/bluetooth/hci_event.c >> @@ -1092,7 +1092,12 @@ static void hci_cc_le_set_scan_enable(struct >> hci_dev *hdev, >> set_bit(HCI_LE_SCAN, &hdev->dev_flags); >> >> hci_dev_lock(hdev); >> - hci_discovery_set_state(hdev, DISCOVERY_FINDING); >> + if (hdev->discovery.state == DISCOVERY_STOPPING) { >> + hci_cancel_le_scan(hdev); >> + mgmt_start_discovery_complete(hdev, 0); > > Reply to mgmt with an error here might be better. I think the best error which can be given here is MGMT_STATUS_CANCELLED. But this error is not accessible in hci_event.c >> + } else { >> + hci_discovery_set_state(hdev, DISCOVERY_FINDING); >> + } >> hci_dev_unlock(hdev); >> break; >> >> @@ -1189,7 +1194,12 @@ static void hci_cs_inquiry(struct hci_dev *hdev, >> __u8 status) >> set_bit(HCI_INQUIRY, &hdev->flags); >> >> hci_dev_lock(hdev); >> - hci_discovery_set_state(hdev, DISCOVERY_FINDING); >> + if (hdev->discovery.state == DISCOVERY_STOPPING) { >> + hci_cancel_inquiry(hdev); >> + mgmt_start_discovery_complete(hdev, 0); >> + } else { >> + hci_discovery_set_state(hdev, DISCOVERY_FINDING); >> + } >> hci_dev_unlock(hdev); >> } >> >> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c >> index d6c0d78..ba4171f 100644 >> --- a/net/bluetooth/mgmt.c >> +++ b/net/bluetooth/mgmt.c >> @@ -2385,7 +2385,8 @@ static int stop_discovery(struct sock *sk, struct >> hci_dev *hdev, void *data, >> >> hci_dev_lock(hdev); >> >> - if (!hci_discovery_active(hdev)) { >> + if (hdev->discovery.state != DISCOVERY_STARTING && >> + !hci_discovery_active(hdev)) { >> err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY, >> MGMT_STATUS_REJECTED, &mgmt_cp->type, >> sizeof(mgmt_cp->type)); >> @@ -2433,6 +2434,10 @@ static int stop_discovery(struct sock *sk, struct >> hci_dev *hdev, void *data, >> >> break; >> >> + case DISCOVERY_STARTING: >> + err = 0; >> + break; >> + >> default: >> BT_DBG("unknown discovery state %u", hdev->discovery.state); >> err = -EFAULT; >> @@ -3624,6 +3629,25 @@ int mgmt_start_discovery_failed(struct hci_dev >> *hdev, u8 status) >> return err; >> } >> >> +int mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status) >> +{ >> + struct pending_cmd *cmd; >> + u8 type; >> + int err; >> + >> + cmd = mgmt_pending_find(MGMT_OP_START_DISCOVERY, hdev); >> + if (!cmd) >> + return -ENOENT; >> + >> + type = hdev->discovery.type; >> + >> + err = cmd_complete(cmd->sk, hdev->id, cmd->opcode, mgmt_status(status), >> + &type, sizeof(type)); >> + mgmt_pending_remove(cmd); >> + >> + return err; >> +} > > This is exactly the same thing as mgmt_start_discovery_failed(), just > rename it > to _complete() as you did with mgmt_stop_discovery_failed(). Do it as a > separate patch. mgmt_start_discovery_failed() sets discovery state to STOPPED which also sends stop_discovery_complete internally. I think both are inappropriate at the point where mgmt_start_discovery_complete() is called. How abt renaming the new function mgmt_start_discovery_complete() to mgmt_start_discovery_cancelled and send MGMT_STATUS_CANCELLED in that? This way your first comment also will be taken care. Please let me know your opinion. Thanks, Jaganath ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state 2013-01-04 7:46 ` Jaganath Kanakkassery @ 2013-01-09 21:37 ` Gustavo Padovan 0 siblings, 0 replies; 6+ messages in thread From: Gustavo Padovan @ 2013-01-09 21:37 UTC (permalink / raw) To: Jaganath Kanakkassery; +Cc: linux-bluetooth Hi Jaganath, * Jaganath Kanakkassery <jaganath.k@samsung.com> [2013-01-04 13:16:11 +0530]: > Hi Gustavo, > > -------------------------------------------------- > From: "Gustavo Padovan" <gustavo@padovan.org> > Sent: Friday, January 04, 2013 1:08 AM > To: "Jaganath Kanakkassery" <jaganath.k@samsung.com> > Cc: <linux-bluetooth@vger.kernel.org> > Subject: Re: [PATCH v2 2/2] Bluetooth: Fix stop discovery while in > STARTING state > > >Hi Jaganath, > > > >* Jaganath Kanakkassery <jaganath.k@samsung.com> [2012-12-21 > >18:20:25 +0530]: > > > >>If stop_discovery() is called when discovery state is STARTING, it > >>will be failed currently. This patch fixes this. > >> > >>Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com> > >>--- > >> include/net/bluetooth/hci_core.h | 2 ++ > >> net/bluetooth/hci_event.c | 14 ++++++++++++-- > >> net/bluetooth/mgmt.c | 31 ++++++++++++++++++++++++++++++- > >> 3 files changed, 44 insertions(+), 3 deletions(-) > >> > >>diff --git a/include/net/bluetooth/hci_core.h > >>b/include/net/bluetooth/hci_core.h > >>index 119fcb6..c2886b7 100644 > >>--- a/include/net/bluetooth/hci_core.h > >>+++ b/include/net/bluetooth/hci_core.h > >>@@ -64,6 +64,7 @@ struct discovery_state { > >> DISCOVERY_RESOLVING, > >> DISCOVERY_STOPPING, > >> } state; > >>+ u8 discovering; > >> struct list_head all; /* All devices found during inquiry */ > >> struct list_head unknown; /* Name state not known */ > >> struct list_head resolve; /* Name needs to be resolved */ > >>@@ -1066,6 +1067,7 @@ int mgmt_device_found(struct hci_dev > >>*hdev, bdaddr_t *bdaddr, u8 link_type, > >> int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 > >>link_type, > >> u8 addr_type, s8 rssi, u8 *name, u8 name_len); > >> int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); > >>+int mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status); > >> int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status); > >> int mgmt_discovering(struct hci_dev *hdev, u8 discovering); > >> int mgmt_interleaved_discovery(struct hci_dev *hdev); > >>diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > >>index e248e7c..b486458 100644 > >>--- a/net/bluetooth/hci_event.c > >>+++ b/net/bluetooth/hci_event.c > >>@@ -1092,7 +1092,12 @@ static void > >>hci_cc_le_set_scan_enable(struct hci_dev *hdev, > >> set_bit(HCI_LE_SCAN, &hdev->dev_flags); > >> > >> hci_dev_lock(hdev); > >>- hci_discovery_set_state(hdev, DISCOVERY_FINDING); > >>+ if (hdev->discovery.state == DISCOVERY_STOPPING) { > >>+ hci_cancel_le_scan(hdev); > >>+ mgmt_start_discovery_complete(hdev, 0); > > > >Reply to mgmt with an error here might be better. > > I think the best error which can be given here is > MGMT_STATUS_CANCELLED. But this error is not accessible in hci_event.c > > >>+ } else { > >>+ hci_discovery_set_state(hdev, DISCOVERY_FINDING); > >>+ } > >> hci_dev_unlock(hdev); > >> break; > >> > >>@@ -1189,7 +1194,12 @@ static void hci_cs_inquiry(struct hci_dev > >>*hdev, __u8 status) > >> set_bit(HCI_INQUIRY, &hdev->flags); > >> > >> hci_dev_lock(hdev); > >>- hci_discovery_set_state(hdev, DISCOVERY_FINDING); > >>+ if (hdev->discovery.state == DISCOVERY_STOPPING) { > >>+ hci_cancel_inquiry(hdev); > >>+ mgmt_start_discovery_complete(hdev, 0); > >>+ } else { > >>+ hci_discovery_set_state(hdev, DISCOVERY_FINDING); > >>+ } > >> hci_dev_unlock(hdev); > >> } > >> > >>diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c > >>index d6c0d78..ba4171f 100644 > >>--- a/net/bluetooth/mgmt.c > >>+++ b/net/bluetooth/mgmt.c > >>@@ -2385,7 +2385,8 @@ static int stop_discovery(struct sock *sk, > >>struct hci_dev *hdev, void *data, > >> > >> hci_dev_lock(hdev); > >> > >>- if (!hci_discovery_active(hdev)) { > >>+ if (hdev->discovery.state != DISCOVERY_STARTING && > >>+ !hci_discovery_active(hdev)) { > >> err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY, > >> MGMT_STATUS_REJECTED, &mgmt_cp->type, > >> sizeof(mgmt_cp->type)); > >>@@ -2433,6 +2434,10 @@ static int stop_discovery(struct sock > >>*sk, struct hci_dev *hdev, void *data, > >> > >> break; > >> > >>+ case DISCOVERY_STARTING: > >>+ err = 0; > >>+ break; > >>+ > >> default: > >> BT_DBG("unknown discovery state %u", hdev->discovery.state); > >> err = -EFAULT; > >>@@ -3624,6 +3629,25 @@ int mgmt_start_discovery_failed(struct > >>hci_dev *hdev, u8 status) > >> return err; > >> } > >> > >>+int mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status) > >>+{ > >>+ struct pending_cmd *cmd; > >>+ u8 type; > >>+ int err; > >>+ > >>+ cmd = mgmt_pending_find(MGMT_OP_START_DISCOVERY, hdev); > >>+ if (!cmd) > >>+ return -ENOENT; > >>+ > >>+ type = hdev->discovery.type; > >>+ > >>+ err = cmd_complete(cmd->sk, hdev->id, cmd->opcode, mgmt_status(status), > >>+ &type, sizeof(type)); > >>+ mgmt_pending_remove(cmd); > >>+ > >>+ return err; > >>+} > > > >This is exactly the same thing as mgmt_start_discovery_failed(), > >just rename it > >to _complete() as you did with mgmt_stop_discovery_failed(). Do it as a > >separate patch. > > mgmt_start_discovery_failed() sets discovery state to STOPPED which > also sends > stop_discovery_complete internally. I think both are inappropriate > at the point > where mgmt_start_discovery_complete() is called. > > How abt renaming the new function mgmt_start_discovery_complete() to > mgmt_start_discovery_cancelled and send MGMT_STATUS_CANCELLED in that? Ok, go with this approach. Gustavo ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-09 21:37 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-12-21 12:50 [PATCH v2 0/2] Fix stop discovery not handled if discovery state is STARTING Jaganath Kanakkassery 2012-12-21 12:50 ` [PATCH v2 1/2] Bluetooth: Move discovery state check inside hci_dev_lock() Jaganath Kanakkassery 2012-12-21 12:50 ` [PATCH v2 2/2] Bluetooth: Fix stop discovery while in STARTING state Jaganath Kanakkassery 2013-01-03 19:38 ` Gustavo Padovan 2013-01-04 7:46 ` Jaganath Kanakkassery 2013-01-09 21:37 ` Gustavo Padovan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).