From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 3/3] Bluetooth: mgmt: Add address type to confirm name command
Date: Fri, 17 Feb 2012 14:32:27 +0200 [thread overview]
Message-ID: <1329481947-19108-3-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1329481947-19108-1-git-send-email-johan.hedberg@gmail.com>
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
next prev parent reply other threads:[~2012-02-17 12:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` johan.hedberg [this message]
2012-02-17 12:35 ` [PATCH 3/3] Bluetooth: mgmt: Add address type to confirm name command Marcel Holtmann
2012-02-17 12:34 ` [PATCH 1/3] Bluetooth: mgmt: Add address type to link key messages Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329481947-19108-3-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).