From 5ad1f2a53fafbb64cb37b0f7e75663d3aa8a61f4 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 9 Feb 2012 15:44:09 +0200
Subject: [PATCH] --- yaml --- r: 290943 b: refs/heads/master c:
 664ce4cc293cd6c76236617f78689d0e03e69287 h: refs/heads/master i:   290941:
 b48e5c53287593071ad833cb1f46afa63840bbc0   290939:
 56de738c3cf82f57f3a4ca21b166d169b9e9617d   290935:
 b9b33181ec50d4afb1895dc1953465bf9074c4db   290927:
 d72cf2a09e58a0c931819de8ffe3b4240c8a251a   290911:
 f7fbdf40461929127b2f49731ef9c3a5552edc8a   290879:
 7835871ae4aa815b3df02a5d7aaa03c418b7a450   290815:
 ef80caba204a6a27732748ce85563df94c39529e v: v3

---
 [refs]                             | 2 +-
 trunk/include/net/bluetooth/mgmt.h | 4 ++--
 trunk/net/bluetooth/mgmt.c         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 121b650cab9b..bbbd68b7c103 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 272d90df2d4d065e782cafb08358bd8918bf703a
+refs/heads/master: 664ce4cc293cd6c76236617f78689d0e03e69287
diff --git a/trunk/include/net/bluetooth/mgmt.h b/trunk/include/net/bluetooth/mgmt.h
index 378d498896b3..f284499b5f7f 100644
--- a/trunk/include/net/bluetooth/mgmt.h
+++ b/trunk/include/net/bluetooth/mgmt.h
@@ -270,14 +270,14 @@ struct mgmt_rp_read_local_oob_data {
 
 #define MGMT_OP_ADD_REMOTE_OOB_DATA	0x0021
 struct mgmt_cp_add_remote_oob_data {
-	bdaddr_t bdaddr;
+	struct mgmt_addr_info addr;
 	__u8 hash[16];
 	__u8 randomizer[16];
 } __packed;
 
 #define MGMT_OP_REMOVE_REMOTE_OOB_DATA	0x0022
 struct mgmt_cp_remove_remote_oob_data {
-	bdaddr_t bdaddr;
+	struct mgmt_addr_info addr;
 } __packed;
 
 #define MGMT_OP_START_DISCOVERY		0x0023
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 16fc828096f6..763a447b2532 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -1875,7 +1875,7 @@ static int add_remote_oob_data(struct sock *sk, u16 index, void *data,
 
 	hci_dev_lock(hdev);
 
-	err = hci_add_remote_oob_data(hdev, &cp->bdaddr, cp->hash,
+	err = hci_add_remote_oob_data(hdev, &cp->addr.bdaddr, cp->hash,
 								cp->randomizer);
 	if (err < 0)
 		err = cmd_status(sk, index, MGMT_OP_ADD_REMOTE_OOB_DATA,
@@ -1910,7 +1910,7 @@ static int remove_remote_oob_data(struct sock *sk, u16 index,
 
 	hci_dev_lock(hdev);
 
-	err = hci_remove_remote_oob_data(hdev, &cp->bdaddr);
+	err = hci_remove_remote_oob_data(hdev, &cp->addr.bdaddr);
 	if (err < 0)
 		err = cmd_status(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
 						MGMT_STATUS_INVALID_PARAMS);