summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
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 /net/bluetooth
parent86a8cfc6d0428f32d702ec59c1b3ef38541a6821 (diff)
downloadblackbird-op-linux-9a395a80dc6a2004787539dcc0c7d167ba87e89a.tar.gz
blackbird-op-linux-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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c3
1 files changed, 2 insertions, 1 deletions
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);
OpenPOWER on IntegriCloud