---

yaml --- r: 291047 b: refs/heads/master c: 9a395a8 h: refs/heads/master i: 291045: 928d060 291043: 6a577b9 291039: 07968f4 v: v3
git-mirror · Feb 23, 2012 · 97b563e · 97b563e
1 parent 63b5f1a
commit 97b563e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86a8cfc6d0428f32d702ec59c1b3ef38541a6821
+refs/heads/master: 9a395a80dc6a2004787539dcc0c7d167ba87e89a
diff --git a/trunk/include/net/bluetooth/mgmt.h b/trunk/include/net/bluetooth/mgmt.h
@@ -393,11 +393,14 @@ struct mgmt_ev_auth_failed {
 	__u8 status;
 } __packed;
 
+#define MGMT_DEV_FOUND_CONFIRM_NAME    0x01
+#define MGMT_DEV_FOUND_LEGACY_PAIRING  0x02
+
 #define MGMT_EV_DEVICE_FOUND		0x0012
 struct mgmt_ev_device_found {
 	struct mgmt_addr_info addr;
 	__s8 rssi;
-	__u8 confirm_name;
+	__u8 flags[4];
 	__le16 eir_len;
 	__u8 eir[0];
 } __packed;

diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
@@ -3745,7 +3745,8 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
 	bacpy(&ev->addr.bdaddr, bdaddr);
 	ev->addr.type = link_to_mgmt(link_type, addr_type);
 	ev->rssi = rssi;
-	ev->confirm_name = cfm_name;
+	if (cfm_name)
+		ev->flags[0] |= MGMT_DEV_FOUND_CONFIRM_NAME;
 
 	if (eir_len > 0)
 		memcpy(ev->eir, eir, eir_len);