2020-05-04 15:39:47

by Alain Michaud

Subject: [BlueZ PATCH v2] Fixing opcode definition order

Fixing what looks like a bad merge in the opcode order.

Signed-off-by: Alain Michaud <[email protected]>
---

lib/mgmt.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/mgmt.h b/lib/mgmt.h
index e46e08ba8..0722c5206 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -586,15 +586,11 @@ struct mgmt_cp_set_phy_confguration {

#define MGMT_OP_SET_BLOCKED_KEYS 0x0046

-#define MGMT_OP_READ_SECURITY_INFO 0x0048
-struct mgmt_rp_read_security_info {
- uint16_t sec_len;
- uint8_t sec[0];
-} __packed;
+#define MGMT_OP_SET_WIDEBAND_SPEECH 0x0047

#define HCI_BLOCKED_KEY_TYPE_LINKKEY 0x00
-#define HCI_BLOCKED_KEY_TYPE_LTK 0x01
-#define HCI_BLOCKED_KEY_TYPE_IRK 0x02
+#define HCI_BLOCKED_KEY_TYPE_LTK 0x01
+#define HCI_BLOCKED_KEY_TYPE_IRK 0x02

struct mgmt_blocked_key_info {
uint8_t type;
@@ -606,7 +602,11 @@ struct mgmt_cp_set_blocked_keys {
struct mgmt_blocked_key_info keys[0];
} __packed;

-#define MGMT_OP_SET_WIDEBAND_SPEECH 0x0047
+#define MGMT_OP_READ_SECURITY_INFO 0x0048
+struct mgmt_rp_read_security_info {
+ uint16_t sec_len;
+ uint8_t sec[0];
+} __packed;

#define MGMT_EV_CMD_COMPLETE 0x0001
struct mgmt_ev_cmd_complete {
--
2.26.2.526.g744177e7f7-goog

2020-05-05 20:59:30

by Marcel Holtmann

Subject: Re: [BlueZ PATCH v2] Fixing opcode definition order

Hi Alain,

> Fixing what looks like a bad merge in the opcode order.
>
> Signed-off-by: Alain Michaud <[email protected]>
> ---
>
> lib/mgmt.h | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)

patch has been applied.

Regards

Marcel