Return-Path: MIME-Version: 1.0 In-Reply-To: <1331825216.14217.128.camel@aeonflux> References: <1331297862-28875-1-git-send-email-andre.guedes@openbossa.org> <1331297862-28875-2-git-send-email-andre.guedes@openbossa.org> <1331825216.14217.128.camel@aeonflux> Date: Thu, 15 Mar 2012 15:31:10 -0300 Message-ID: Subject: Re: [PATCH v2 1/2] Bluetooth: Add hci_cancel_le_scan() to hci_core From: Andre Guedes To: Marcel Holtmann Cc: linux-bluetooth@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 List-ID: Hi Marcel, On Thu, Mar 15, 2012 at 12:26 PM, Marcel Holtmann wro= te: > Hi Andre, > >> This patch adds to hci_core the hci_cancel_le_scan function which >> should be used to cancel an ongoing LE scan. >> >> Signed-off-by: Andre Guedes >> --- >> =A0include/net/bluetooth/hci_core.h | =A0 =A01 + >> =A0net/bluetooth/hci_core.c =A0 =A0 =A0 =A0 | =A0 21 +++++++++++++++++++= ++ >> =A02 files changed, 22 insertions(+) >> >> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hc= i_core.h >> index daefaac..87bca3e 100644 >> --- a/include/net/bluetooth/hci_core.h >> +++ b/include/net/bluetooth/hci_core.h >> @@ -1071,5 +1071,6 @@ int hci_do_inquiry(struct hci_dev *hdev, u8 length= ); >> =A0int hci_cancel_inquiry(struct hci_dev *hdev); >> =A0int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 wind= ow, >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 int timeout); >> +int hci_cancel_le_scan(struct hci_dev *hdev); >> >> =A0#endif /* __HCI_CORE_H */ >> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c >> index 59ec99e..0320a02 100644 >> --- a/net/bluetooth/hci_core.c >> +++ b/net/bluetooth/hci_core.c >> @@ -1667,6 +1667,27 @@ static int hci_do_le_scan(struct hci_dev *hdev, u= 8 type, u16 interval, >> =A0 =A0 =A0 return 0; >> =A0} >> >> +int hci_cancel_le_scan(struct hci_dev *hdev) >> +{ >> + =A0 =A0 bool canceled; >> + >> + =A0 =A0 BT_DBG("%s", hdev->name); >> + >> + =A0 =A0 if (!test_bit(HCI_LE_SCAN, &hdev->dev_flags)) >> + =A0 =A0 =A0 =A0 =A0 =A0 return -EALREADY; >> + >> + =A0 =A0 canceled =3D cancel_delayed_work(&hdev->le_scan_disable); > > why are we using the canceled variable here? Seems pointless. Because le_scan_disable work may be running when cancel_delayed_work returns (canceled =3D=3D 0). If le_scan_disable work is running, we should not send HCI_OP_LE_SET_SCAN_ENABLE command since le_scan_disable work already sends it. This way we avoid sending two HCI_OP_LE_SET_SCAN_ENABLE commands when this race condition occurs. BR, Andre