summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-01-25 20:32:22 +0100
committerAdrian Bunk <bunk@stusta.de>2007-01-26 20:49:22 +0100
commitecfad2cc55c3de17bc896816c49597cfacf2e3cf (patch)
tree70c258c0d4c1f1c29ce914acc204139b76ea2852
parentc850ae1c17cacc4d9dd68616635ca1af4ed6c97e (diff)
downloadlinux-stable-ecfad2cc55c3de17bc896816c49597cfacf2e3cf.tar.gz
linux-stable-ecfad2cc55c3de17bc896816c49597cfacf2e3cf.tar.bz2
linux-stable-ecfad2cc55c3de17bc896816c49597cfacf2e3cf.zip
[Bluetooth] Handle command complete event for exit periodic inquiry
The command complete event of the exit periodic inquiry command must clear the HCI_INQUIRY flag and finish the HCI request. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r--include/net/bluetooth/hci.h2
-rw-r--r--net/bluetooth/hci_event.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b06a2d2f63d2..80a4c1ba82c3 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -329,6 +329,8 @@ struct hci_cp_inquiry {
#define OCF_INQUIRY_CANCEL 0x0002
+#define OCF_EXIT_PERIODIC_INQ 0x0004
+
#define OCF_LINK_KEY_REPLY 0x000B
struct hci_cp_link_key_reply {
bdaddr_t bdaddr;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index eb64555d1fb3..d02ff17e65fe 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -63,6 +63,7 @@ static void hci_cc_link_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb
switch (ocf) {
case OCF_INQUIRY_CANCEL:
+ case OCF_EXIT_PERIODIC_INQ:
status = *((__u8 *) skb->data);
if (status) {