aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-23 00:00:32 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-23 13:07:01 +0200
commit9a395a80dc6a2004787539dcc0c7d167ba87e89a (patch)
tree763910b44beae06be94afd6f52af85e272a5c6cd
parentBluetooth: mgmt: Fix unpair_device responses (diff)
downloadlinux-dev-9a395a80dc6a2004787539dcc0c7d167ba87e89a.tar.xz
linux-dev-9a395a80dc6a2004787539dcc0c7d167ba87e89a.zip
Bluetooth: mgmt: Fix device_found parameters
According to the latest mgmt API there's a flags field instead of a separate confirm_name paramter. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--include/net/bluetooth/mgmt.h5
-rw-r--r--net/bluetooth/mgmt.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 495668c77fb6..09646f5ef36a 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/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/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 36bebfb2d840..b7b10ca297d5 100644
--- a/net/bluetooth/mgmt.c
+++ b/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);