* [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages
@ 2012-02-17 12:32 johan.hedberg
2012-02-17 12:32 ` [PATCH 2/3] Bluetooth: mgmt: Add address type to PIN code messages johan.hedberg
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: johan.hedberg @ 2012-02-17 12:32 UTC (permalink / raw)
To: linux-bluetooth
From: Johan Hedberg <johan.hedberg@intel.com>
The latest mgmt API includes an address type wherever there's an address
present. This patch updates the link key messages to match it.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
include/net/bluetooth/mgmt.h | 2 +-
net/bluetooth/mgmt.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 255a996..5aafe92 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -153,7 +153,7 @@ struct mgmt_cp_remove_uuid {
} __packed;
struct mgmt_link_key_info {
- bdaddr_t bdaddr;
+ struct mgmt_addr_info addr;
u8 type;
u8 val[16];
u8 pin_len;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 36c4ff6..b0de719 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1274,8 +1274,8 @@ static int load_link_keys(struct sock *sk, u16 index, void *data, u16 len)
for (i = 0; i < key_count; i++) {
struct mgmt_link_key_info *key = &cp->keys[i];
- hci_add_link_key(hdev, NULL, 0, &key->bdaddr, key->val, key->type,
- key->pin_len);
+ hci_add_link_key(hdev, NULL, 0, &key->addr.bdaddr, key->val,
+ key->type, key->pin_len);
}
cmd_complete(sk, index, MGMT_OP_LOAD_LINK_KEYS, NULL, 0);
@@ -2788,7 +2788,8 @@ int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
memset(&ev, 0, sizeof(ev));
ev.store_hint = persistent;
- bacpy(&ev.key.bdaddr, &key->bdaddr);
+ bacpy(&ev.key.addr.bdaddr, &key->bdaddr);
+ ev.key.addr.type = MGMT_ADDR_BREDR;
ev.key.type = key->type;
memcpy(ev.key.val, key->val, 16);
ev.key.pin_len = key->pin_len;
--
1.7.9
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] Bluetooth: mgmt: Add address type to PIN code messages 2012-02-17 12:32 [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages johan.hedberg @ 2012-02-17 12:32 ` johan.hedberg 2012-02-17 12:34 ` Marcel Holtmann 2012-02-17 12:32 ` [PATCH 3/3] Bluetooth: mgmt: Add address type to confirm name command johan.hedberg 2012-02-17 12:34 ` [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages Marcel Holtmann 2 siblings, 1 reply; 6+ messages in thread From: johan.hedberg @ 2012-02-17 12:32 UTC (permalink / raw) To: linux-bluetooth From: Johan Hedberg <johan.hedberg@intel.com> The latest mgmt API includes address types for all messages containing an address. This patch updates the PIN code messages to match this. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> --- include/net/bluetooth/mgmt.h | 8 ++++---- net/bluetooth/mgmt.c | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index 5aafe92..eb584cc 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h @@ -199,18 +199,18 @@ struct mgmt_rp_get_connections { #define MGMT_OP_PIN_CODE_REPLY 0x0016 struct mgmt_cp_pin_code_reply { - bdaddr_t bdaddr; + struct mgmt_addr_info addr; __u8 pin_len; __u8 pin_code[16]; } __packed; struct mgmt_rp_pin_code_reply { - bdaddr_t bdaddr; + struct mgmt_addr_info addr; uint8_t status; } __packed; #define MGMT_OP_PIN_CODE_NEG_REPLY 0x0017 struct mgmt_cp_pin_code_neg_reply { - bdaddr_t bdaddr; + struct mgmt_addr_info addr; } __packed; #define MGMT_OP_SET_IO_CAPABILITY 0x0018 @@ -377,7 +377,7 @@ struct mgmt_ev_connect_failed { #define MGMT_EV_PIN_CODE_REQUEST 0x000E struct mgmt_ev_pin_code_request { - bdaddr_t bdaddr; + struct mgmt_addr_info addr; __u8 secure; } __packed; diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index b0de719..6862340 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1528,8 +1528,8 @@ static int send_pin_code_neg_reply(struct sock *sk, u16 index, if (!cmd) return -ENOMEM; - err = hci_send_cmd(hdev, HCI_OP_PIN_CODE_NEG_REPLY, sizeof(cp->bdaddr), - &cp->bdaddr); + err = hci_send_cmd(hdev, HCI_OP_PIN_CODE_NEG_REPLY, + sizeof(cp->addr.bdaddr), &cp->addr.bdaddr); if (err < 0) mgmt_pending_remove(cmd); @@ -1541,7 +1541,6 @@ static int pin_code_reply(struct sock *sk, u16 index, void *data, u16 len) struct hci_dev *hdev; struct hci_conn *conn; struct mgmt_cp_pin_code_reply *cp = data; - struct mgmt_cp_pin_code_neg_reply ncp; struct hci_cp_pin_code_reply reply; struct pending_cmd *cmd; int err; @@ -1565,7 +1564,7 @@ static int pin_code_reply(struct sock *sk, u16 index, void *data, u16 len) goto failed; } - conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr); + conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->addr.bdaddr); if (!conn) { err = cmd_status(sk, index, MGMT_OP_PIN_CODE_REPLY, MGMT_STATUS_NOT_CONNECTED); @@ -1573,7 +1572,9 @@ static int pin_code_reply(struct sock *sk, u16 index, void *data, u16 len) } if (conn->pending_sec_level == BT_SECURITY_HIGH && cp->pin_len != 16) { - bacpy(&ncp.bdaddr, &cp->bdaddr); + struct mgmt_cp_pin_code_neg_reply ncp; + + memcpy(&ncp.addr, &cp->addr, sizeof(ncp.addr)); BT_ERR("PIN code is not 16 bytes long"); @@ -1592,7 +1593,7 @@ static int pin_code_reply(struct sock *sk, u16 index, void *data, u16 len) goto failed; } - bacpy(&reply.bdaddr, &cp->bdaddr); + bacpy(&reply.bdaddr, &cp->addr.bdaddr); reply.pin_len = cp->pin_len; memcpy(reply.pin_code, cp->pin_code, sizeof(reply.pin_code)); @@ -2945,7 +2946,8 @@ int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure) { struct mgmt_ev_pin_code_request ev; - bacpy(&ev.bdaddr, bdaddr); + bacpy(&ev.addr.bdaddr, bdaddr); + ev.addr.type = MGMT_ADDR_BREDR; ev.secure = secure; return mgmt_event(MGMT_EV_PIN_CODE_REQUEST, hdev, &ev, sizeof(ev), @@ -2963,7 +2965,8 @@ int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, if (!cmd) return -ENOENT; - bacpy(&rp.bdaddr, bdaddr); + bacpy(&rp.addr.bdaddr, bdaddr); + rp.addr.type = MGMT_ADDR_BREDR; rp.status = mgmt_status(status); err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_REPLY, &rp, @@ -2985,7 +2988,8 @@ int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, if (!cmd) return -ENOENT; - bacpy(&rp.bdaddr, bdaddr); + bacpy(&rp.addr.bdaddr, bdaddr); + rp.addr.type = MGMT_ADDR_BREDR; rp.status = mgmt_status(status); err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY, &rp, -- 1.7.9 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] Bluetooth: mgmt: Add address type to PIN code messages 2012-02-17 12:32 ` [PATCH 2/3] Bluetooth: mgmt: Add address type to PIN code messages johan.hedberg @ 2012-02-17 12:34 ` Marcel Holtmann 0 siblings, 0 replies; 6+ messages in thread From: Marcel Holtmann @ 2012-02-17 12:34 UTC (permalink / raw) To: johan.hedberg; +Cc: linux-bluetooth Hi Johan, > The latest mgmt API includes address types for all messages containing > an address. This patch updates the PIN code messages to match this. > > Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> > --- > include/net/bluetooth/mgmt.h | 8 ++++---- > net/bluetooth/mgmt.c | 22 +++++++++++++--------- > 2 files changed, 17 insertions(+), 13 deletions(-) Acked-by: Marcel Holtmann <marcel@holtmann.org> Regards Marcel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] Bluetooth: mgmt: Add address type to confirm name command 2012-02-17 12:32 [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages johan.hedberg 2012-02-17 12:32 ` [PATCH 2/3] Bluetooth: mgmt: Add address type to PIN code messages johan.hedberg @ 2012-02-17 12:32 ` johan.hedberg 2012-02-17 12:35 ` Marcel Holtmann 2012-02-17 12:34 ` [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages Marcel Holtmann 2 siblings, 1 reply; 6+ messages in thread From: johan.hedberg @ 2012-02-17 12:32 UTC (permalink / raw) To: linux-bluetooth From: Johan Hedberg <johan.hedberg@intel.com> The latest mgmt API includes an address type for all messages containing an address. This patch updates the confirm name command to match this. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> --- include/net/bluetooth/mgmt.h | 4 ++-- net/bluetooth/mgmt.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index eb584cc..14c1816 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h @@ -296,11 +296,11 @@ struct mgmt_cp_start_discovery { #define MGMT_OP_CONFIRM_NAME 0x0025 struct mgmt_cp_confirm_name { - bdaddr_t bdaddr; + struct mgmt_addr_info addr; __u8 name_known; } __packed; struct mgmt_rp_confirm_name { - bdaddr_t bdaddr; + struct mgmt_addr_info addr; __u8 status; } __packed; diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 6862340..01c8d62 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -2299,7 +2299,7 @@ static int confirm_name(struct sock *sk, u16 index, void *data, u16 len) goto failed; } - e = hci_inquiry_cache_lookup_unknown(hdev, &cp->bdaddr); + e = hci_inquiry_cache_lookup_unknown(hdev, &cp->addr.bdaddr); if (!e) { err = cmd_status (sk, index, MGMT_OP_CONFIRM_NAME, MGMT_STATUS_INVALID_PARAMS); -- 1.7.9 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] Bluetooth: mgmt: Add address type to confirm name command 2012-02-17 12:32 ` [PATCH 3/3] Bluetooth: mgmt: Add address type to confirm name command johan.hedberg @ 2012-02-17 12:35 ` Marcel Holtmann 0 siblings, 0 replies; 6+ messages in thread From: Marcel Holtmann @ 2012-02-17 12:35 UTC (permalink / raw) To: johan.hedberg; +Cc: linux-bluetooth Hi Johan, > The latest mgmt API includes an address type for all messages containing > an address. This patch updates the confirm name command to match this. > > Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> > --- > include/net/bluetooth/mgmt.h | 4 ++-- > net/bluetooth/mgmt.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Acked-by: Marcel Holtmann <marcel@holtmann.org> Regards Marcel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages 2012-02-17 12:32 [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages johan.hedberg 2012-02-17 12:32 ` [PATCH 2/3] Bluetooth: mgmt: Add address type to PIN code messages johan.hedberg 2012-02-17 12:32 ` [PATCH 3/3] Bluetooth: mgmt: Add address type to confirm name command johan.hedberg @ 2012-02-17 12:34 ` Marcel Holtmann 2 siblings, 0 replies; 6+ messages in thread From: Marcel Holtmann @ 2012-02-17 12:34 UTC (permalink / raw) To: johan.hedberg; +Cc: linux-bluetooth Hi Johan, > The latest mgmt API includes an address type wherever there's an address > present. This patch updates the link key messages to match it. > > Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> > --- > include/net/bluetooth/mgmt.h | 2 +- > net/bluetooth/mgmt.c | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) Acked-by: Marcel Holtmann <marcel@holtmann.org> Regards Marcel ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-17 12:35 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-02-17 12:32 [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages johan.hedberg 2012-02-17 12:32 ` [PATCH 2/3] Bluetooth: mgmt: Add address type to PIN code messages johan.hedberg 2012-02-17 12:34 ` Marcel Holtmann 2012-02-17 12:32 ` [PATCH 3/3] Bluetooth: mgmt: Add address type to confirm name command johan.hedberg 2012-02-17 12:35 ` Marcel Holtmann 2012-02-17 12:34 ` [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages Marcel Holtmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).