linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [BlueZ PATCH v2] Fixing opcode definition order
@ 2020-05-04 15:36 Alain Michaud
  2020-05-05 20:58 ` Marcel Holtmann
  0 siblings, 1 reply; 2+ messages in thread
From: Alain Michaud @ 2020-05-04 15:36 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Alain Michaud

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

Signed-off-by: Alain Michaud <alainm@chromium.org>
---

 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [BlueZ PATCH v2] Fixing opcode definition order
  2020-05-04 15:36 [BlueZ PATCH v2] Fixing opcode definition order Alain Michaud
@ 2020-05-05 20:58 ` Marcel Holtmann
  0 siblings, 0 replies; 2+ messages in thread
From: Marcel Holtmann @ 2020-05-05 20:58 UTC (permalink / raw)
  To: Alain Michaud; +Cc: linux-bluetooth

Hi Alain,

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

patch has been applied.

Regards

Marcel


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-05-05 20:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-04 15:36 [BlueZ PATCH v2] Fixing opcode definition order Alain Michaud
2020-05-05 20:58 ` 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).