Return-Path: Message-ID: <1330031665.3392.4.camel@aeonflux> Subject: Re: [PATCH] Bluetooth: Check capabilities in BR/EDR and LE-Only discovery From: Marcel Holtmann To: Andre Guedes Cc: linux-bluetooth@vger.kernel.org Date: Thu, 23 Feb 2012 22:14:25 +0100 In-Reply-To: <1330031367-10614-1-git-send-email-andre.guedes@openbossa.org> References: <1330031367-10614-1-git-send-email-andre.guedes@openbossa.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Andre, > This patch add an extra check for BR/EDR and LE-Only discovery. > This way, we are able to return error immediately if the discovery > type requested is not supported by the device. > > Signed-off-by: Andre Guedes > --- > net/bluetooth/mgmt.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c > index 93f2c13..de40918 100644 > --- a/net/bluetooth/mgmt.c > +++ b/net/bluetooth/mgmt.c > @@ -2552,12 +2552,18 @@ static int start_discovery(struct sock *sk, u16 index, > > switch (hdev->discovery.type) { > case DISCOV_TYPE_BREDR: > - err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR); > + if (lmp_bredr_capable(hdev)) > + err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR); > + else > + err = -ENOTSUPP; > break; > > case DISCOV_TYPE_LE: > - err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT, > + if (lmp_host_le_capable(hdev)) > + err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT, > LE_SCAN_WIN, LE_SCAN_TIMEOUT_LE_ONLY); > + else > + err = -ENOTSUPP; > break; > > case DISCOV_TYPE_INTERLEAVED: so what about interleaved. Should that actually suceed if LE is not enabled? Regards Marcel