2011-12-19 12:29:06

by Johan Hedberg

Subject: [PATCH 1/3] Bluetooth: Add missing confirm_name field to mgmt_ev_device_found

From: Johan Hedberg <[email protected]>

This patch adds a missing confirm_name field to mgmt_ev_device_found.
Support for setting the correct value for this field is not implemented
yet, but having it part of the struct definition ensures that user-space
gets correct sized device_found events and is thereby able to do at
least rudimentary parsing of them.

Signed-off-by: Johan Hedberg <[email protected]>
---
include/net/bluetooth/mgmt.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 2b1059d..9f7a956 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -357,6 +357,7 @@ struct mgmt_ev_device_found {
struct mgmt_addr_info addr;
__u8 dev_class[3];
__s8 rssi;
+ __u8 confirm_name;
__u8 eir[HCI_MAX_EIR_LENGTH];
} __packed;

--
1.7.7.3

2011-12-19 13:30:15

by Gustavo Padovan

Subject: Re: [PATCH 3/3] Bluetooth: Add missing mgmt_confirm_name command definition

Hi Johan,

* [email protected] <[email protected]> [2011-12-19 14:29:08 +0200]:

> From: Johan Hedberg <[email protected]>
>
> This patch adds the necessary structs for the Confirm Name command. This
> ensures that the protocol definitions are up to date with the latest
> mgmt specification. The actual implementation of the command will follow
> in a later patch-set.
>
> Signed-off-by: Johan Hedberg <[email protected]>
> ---
> include/net/bluetooth/mgmt.h | 10 ++++++++++
> 1 files changed, 10 insertions(+), 0 deletions(-)

The 3 patches have been applied. Thanks.

Gustavo

2011-12-19 12:29:08

by Johan Hedberg

Subject: [PATCH 3/3] Bluetooth: Add missing mgmt_confirm_name command definition

From: Johan Hedberg <[email protected]>

This patch adds the necessary structs for the Confirm Name command. This
ensures that the protocol definitions are up to date with the latest
mgmt specification. The actual implementation of the command will follow
in a later patch-set.

Signed-off-by: Johan Hedberg <[email protected]>
---
include/net/bluetooth/mgmt.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index f4786a8..be65d34 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -268,6 +268,16 @@ struct mgmt_cp_start_discovery {

#define MGMT_OP_STOP_DISCOVERY 0x0022

+#define MGMT_OP_CONFIRM_NAME 0x0023
+struct mgmt_cp_confirm_name {
+ bdaddr_t bdaddr;
+ __u8 name_known;
+} __packed;
+struct mgmt_rp_confirm_name {
+ bdaddr_t bdaddr;
+ __u8 status;
+} __packed;
+
#define MGMT_OP_BLOCK_DEVICE 0x0024
struct mgmt_cp_block_device {
bdaddr_t bdaddr;
--
1.7.7.3

2011-12-19 12:29:07

by Johan Hedberg

Subject: [PATCH 2/3] Bluetooth: Fix mgmt_(block,unblock)_device opcodes

From: Johan Hedberg <[email protected]>

This patch fixes the opcodes of the Block/Unblock device commands to
match with what user-space expects and to confirm with the latest mgmt
specification. The reason the values were wrong was a missing Confirm
Name command definition (which will be added by a subsequent patch).

Signed-off-by: Johan Hedberg <[email protected]>
---
include/net/bluetooth/mgmt.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 9f7a956..f4786a8 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -268,12 +268,12 @@ struct mgmt_cp_start_discovery {

#define MGMT_OP_STOP_DISCOVERY 0x0022

-#define MGMT_OP_BLOCK_DEVICE 0x0023
+#define MGMT_OP_BLOCK_DEVICE 0x0024
struct mgmt_cp_block_device {
bdaddr_t bdaddr;
} __packed;

-#define MGMT_OP_UNBLOCK_DEVICE 0x0024
+#define MGMT_OP_UNBLOCK_DEVICE 0x0025
struct mgmt_cp_unblock_device {
bdaddr_t bdaddr;
} __packed;
--
1.7.7.3