From 5eb766e63152d9c4f41de2c3baebe7e207ff7082 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 21 Sep 2006 16:04:00 +0200 Subject: [PATCH] --- yaml --- r: 36807 b: refs/heads/master c: defc761bc25643eeedee3abd6af0079ef214b55d h: refs/heads/master i: 36805: be6fdd299c401b60e183c9e2930579f8026eed23 36803: 38cf1eba962336177e6ffe58f105e02182ba895f 36799: 1b3847bc5ed1c4dc309ffbb0b982786663887ed8 v: v3 --- [refs] | 2 +- trunk/include/net/bluetooth/hci.h | 2 ++ trunk/net/bluetooth/hci_event.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e162347f73bd..f92e7f2d67a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ac53939a06c610b394aeb0211b985804f2d2da3 +refs/heads/master: defc761bc25643eeedee3abd6af0079ef214b55d diff --git a/trunk/include/net/bluetooth/hci.h b/trunk/include/net/bluetooth/hci.h index fde08f452b59..5f04181b8109 100644 --- a/trunk/include/net/bluetooth/hci.h +++ b/trunk/include/net/bluetooth/hci.h @@ -340,6 +340,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/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index 3896dabab11d..c6cd243939e6 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/net/bluetooth/hci_event.c @@ -62,6 +62,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) {