Bluetooth: Fix coding style in mgmt.h

Align struct definition in a proper way.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 0ca3519e08bd16d2607c1ee1e02efbf266c1830a..61953dc848a62c3e7373578465c721359418332f 100644 (file)
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -44,37 +44,37 @@
 #define MGMT_STATUS_INVALID_INDEX      0x11
 
 struct mgmt_hdr {
-       __le16 opcode;
-       __le16 index;
-       __le16 len;
+       __le16  opcode;
+       __le16  index;
+       __le16  len;
 } __packed;
 
 struct mgmt_addr_info {
-       bdaddr_t bdaddr;
-       __u8 type;
+       bdaddr_t        bdaddr;
+       __u8            type;
 } __packed;
 #define MGMT_ADDR_INFO_SIZE            7
 
 #define MGMT_OP_READ_VERSION           0x0001
 #define MGMT_READ_VERSION_SIZE         0
 struct mgmt_rp_read_version {
-       __u8 version;
-       __le16 revision;
+       __u8    version;
+       __le16  revision;
 } __packed;
 
 #define MGMT_OP_READ_COMMANDS          0x0002
 #define MGMT_READ_COMMANDS_SIZE                0
 struct mgmt_rp_read_commands {
-       __le16 num_commands;
-       __le16 num_events;
-       __le16 opcodes[0];
+       __le16  num_commands;
+       __le16  num_events;
+       __le16  opcodes[0];
 } __packed;
 
 #define MGMT_OP_READ_INDEX_LIST                0x0003
 #define MGMT_READ_INDEX_LIST_SIZE      0
 struct mgmt_rp_read_index_list {
-       __le16 num_controllers;
-       __le16 index[0];
+       __le16  num_controllers;
+       __le16  index[0];
 } __packed;
 
 /* Reserve one extra byte for names in management messages so that they
@@ -96,14 +96,14 @@ struct mgmt_rp_read_index_list {
 #define MGMT_OP_READ_INFO              0x0004
 #define MGMT_READ_INFO_SIZE            0
 struct mgmt_rp_read_info {
-       bdaddr_t bdaddr;
-       __u8 version;
-       __le16 manufacturer;
-       __le32 supported_settings;
-       __le32 current_settings;
-       __u8 dev_class[3];
-       __u8 name[MGMT_MAX_NAME_LENGTH];
-       __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH];
+       bdaddr_t        bdaddr;
+       __u8            version;
+       __le16          manufacturer;
+       __le32          supported_settings;
+       __le32          current_settings;
+       __u8            dev_class[3];
+       __u8            name[MGMT_MAX_NAME_LENGTH];
+       __u8            short_name[MGMT_MAX_SHORT_NAME_LENGTH];
 } __packed;
 
 struct mgmt_mode {
@@ -116,8 +116,8 @@ struct mgmt_mode {
 
 #define MGMT_OP_SET_DISCOVERABLE       0x0006
 struct mgmt_cp_set_discoverable {
-       __u8 val;
-       __u16 timeout;
+       __u8    val;
+       __u16   timeout;
 } __packed;
 #define MGMT_SET_DISCOVERABLE_SIZE     3
 
@@ -134,63 +134,62 @@ struct mgmt_cp_set_discoverable {
 #define MGMT_OP_SET_HS                 0x000C
 
 #define MGMT_OP_SET_LE                 0x000D
-
 #define MGMT_OP_SET_DEV_CLASS          0x000E
 struct mgmt_cp_set_dev_class {
-       __u8 major;
-       __u8 minor;
+       __u8    major;
+       __u8    minor;
 } __packed;
 #define MGMT_SET_DEV_CLASS_SIZE                2
 
 #define MGMT_OP_SET_LOCAL_NAME         0x000F
 struct mgmt_cp_set_local_name {
-       __u8 name[MGMT_MAX_NAME_LENGTH];
-       __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH];
+       __u8    name[MGMT_MAX_NAME_LENGTH];
+       __u8    short_name[MGMT_MAX_SHORT_NAME_LENGTH];
 } __packed;
 #define MGMT_SET_LOCAL_NAME_SIZE       260
 
 #define MGMT_OP_ADD_UUID               0x0010
 struct mgmt_cp_add_uuid {
-       __u8 uuid[16];
-       __u8 svc_hint;
+       __u8    uuid[16];
+       __u8    svc_hint;
 } __packed;
 #define MGMT_ADD_UUID_SIZE             17
 
 #define MGMT_OP_REMOVE_UUID            0x0011
 struct mgmt_cp_remove_uuid {
-       __u8 uuid[16];
+       __u8    uuid[16];
 } __packed;
 #define MGMT_REMOVE_UUID_SIZE          16
 
 struct mgmt_link_key_info {
        struct mgmt_addr_info addr;
-       u8 type;
-       u8 val[16];
-       u8 pin_len;
+       u8      type;
+       u8      val[16];
+       u8      pin_len;
 } __packed;
 
 #define MGMT_OP_LOAD_LINK_KEYS         0x0012
 struct mgmt_cp_load_link_keys {
-       __u8 debug_keys;
-       __le16 key_count;
-       struct mgmt_link_key_info keys[0];
+       __u8    debug_keys;
+       __le16  key_count;
+       struct  mgmt_link_key_info keys[0];
 } __packed;
 #define MGMT_LOAD_LINK_KEYS_SIZE       3
 
 struct mgmt_ltk_info {
        struct mgmt_addr_info addr;
-       __u8 authenticated;
-       __u8 master;
-       __u8 enc_size;
-       __le16 ediv;
-       __u8 rand[8];
-       __u8 val[16];
+       __u8    authenticated;
+       __u8    master;
+       __u8    enc_size;
+       __le16  ediv;
+       __u8    rand[8];
+       __u8    val[16];
 } __packed;
 
 #define MGMT_OP_LOAD_LONG_TERM_KEYS    0x0013
 struct mgmt_cp_load_long_term_keys {
-       __le16 key_count;
-       struct mgmt_ltk_info keys[0];
+       __le16  key_count;
+       struct  mgmt_ltk_info keys[0];
 } __packed;
 #define MGMT_LOAD_LONG_TERM_KEYS_SIZE  2
 
@@ -213,8 +212,8 @@ struct mgmt_rp_get_connections {
 #define MGMT_OP_PIN_CODE_REPLY         0x0016
 struct mgmt_cp_pin_code_reply {
        struct mgmt_addr_info addr;
-       __u8 pin_len;
-       __u8 pin_code[16];
+       __u8    pin_len;
+       __u8    pin_code[16];
 } __packed;
 #define MGMT_PIN_CODE_REPLY_SIZE       (MGMT_ADDR_INFO_SIZE + 17)
 struct mgmt_rp_pin_code_reply {
@@ -229,14 +228,14 @@ struct mgmt_cp_pin_code_neg_reply {
 
 #define MGMT_OP_SET_IO_CAPABILITY      0x0018
 struct mgmt_cp_set_io_capability {
-       __u8 io_capability;
+       __u8    io_capability;
 } __packed;
 #define MGMT_SET_IO_CAPABILITY_SIZE    1
 
 #define MGMT_OP_PAIR_DEVICE            0x0019
 struct mgmt_cp_pair_device {
        struct mgmt_addr_info addr;
-       __u8 io_cap;
+       __u8    io_cap;
 } __packed;
 #define MGMT_PAIR_DEVICE_SIZE          (MGMT_ADDR_INFO_SIZE + 1)
 struct mgmt_rp_pair_device {
@@ -274,7 +273,7 @@ struct mgmt_cp_user_confirm_neg_reply {
 #define MGMT_OP_USER_PASSKEY_REPLY     0x001E
 struct mgmt_cp_user_passkey_reply {
        struct mgmt_addr_info addr;
-       __le32 passkey;
+       __le32  passkey;
 } __packed;
 #define MGMT_USER_PASSKEY_REPLY_SIZE   (MGMT_ADDR_INFO_SIZE + 4)
 struct mgmt_rp_user_passkey_reply {
@@ -290,15 +289,15 @@ struct mgmt_cp_user_passkey_neg_reply {
 #define MGMT_OP_READ_LOCAL_OOB_DATA    0x0020
 #define MGMT_READ_LOCAL_OOB_DATA_SIZE  0
 struct mgmt_rp_read_local_oob_data {
-       __u8 hash[16];
-       __u8 randomizer[16];
+       __u8    hash[16];
+       __u8    randomizer[16];
 } __packed;
 
 #define MGMT_OP_ADD_REMOTE_OOB_DATA    0x0021
 struct mgmt_cp_add_remote_oob_data {
        struct mgmt_addr_info addr;
-       __u8 hash[16];
-       __u8 randomizer[16];
+       __u8    hash[16];
+       __u8    randomizer[16];
 } __packed;
 #define MGMT_ADD_REMOTE_OOB_DATA_SIZE  (MGMT_ADDR_INFO_SIZE + 32)
 
@@ -323,7 +322,7 @@ struct mgmt_cp_stop_discovery {
 #define MGMT_OP_CONFIRM_NAME           0x0025
 struct mgmt_cp_confirm_name {
        struct mgmt_addr_info addr;
-       __u8 name_known;
+       __u8    name_known;
 } __packed;
 #define MGMT_CONFIRM_NAME_SIZE         (MGMT_ADDR_INFO_SIZE + 1)
 struct mgmt_rp_confirm_name {
@@ -344,20 +343,20 @@ struct mgmt_cp_unblock_device {
 
 #define MGMT_EV_CMD_COMPLETE           0x0001
 struct mgmt_ev_cmd_complete {
-       __le16 opcode;
-       __u8 status;
-       __u8 data[0];
+       __le16  opcode;
+       __u8    status;
+       __u8    data[0];
 } __packed;
 
 #define MGMT_EV_CMD_STATUS             0x0002
 struct mgmt_ev_cmd_status {
-       __le16 opcode;
-       __u8 status;
+       __le16  opcode;
+       __u8    status;
 } __packed;
 
 #define MGMT_EV_CONTROLLER_ERROR       0x0003
 struct mgmt_ev_controller_error {
-       __u8 error_code;
+       __u8    error_code;
 } __packed;
 
 #define MGMT_EV_INDEX_ADDED            0x0004
@@ -368,33 +367,33 @@ struct mgmt_ev_controller_error {
 
 #define MGMT_EV_CLASS_OF_DEV_CHANGED   0x0007
 struct mgmt_ev_class_of_dev_changed {
-       __u8 dev_class[3];
+       __u8    dev_class[3];
 };
 
 #define MGMT_EV_LOCAL_NAME_CHANGED     0x0008
 struct mgmt_ev_local_name_changed {
-       __u8 name[MGMT_MAX_NAME_LENGTH];
-       __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH];
+       __u8    name[MGMT_MAX_NAME_LENGTH];
+       __u8    short_name[MGMT_MAX_SHORT_NAME_LENGTH];
 } __packed;
 
 #define MGMT_EV_NEW_LINK_KEY           0x0009
 struct mgmt_ev_new_link_key {
-       __u8 store_hint;
+       __u8    store_hint;
        struct mgmt_link_key_info key;
 } __packed;
 
 #define MGMT_EV_NEW_LONG_TERM_KEY      0x000A
 struct mgmt_ev_new_long_term_key {
-       __u8 store_hint;
+       __u8    store_hint;
        struct mgmt_ltk_info key;
 } __packed;
 
 #define MGMT_EV_DEVICE_CONNECTED       0x000B
 struct mgmt_ev_device_connected {
        struct mgmt_addr_info addr;
-       __le32 flags;
-       __le16 eir_len;
-       __u8 eir[0];
+       __le32  flags;
+       __le16  eir_len;
+       __u8    eir[0];
 } __packed;
 
 #define MGMT_EV_DEVICE_DISCONNECTED    0x000C
@@ -402,20 +401,20 @@ struct mgmt_ev_device_connected {
 #define MGMT_EV_CONNECT_FAILED         0x000D
 struct mgmt_ev_connect_failed {
        struct mgmt_addr_info addr;
-       __u8 status;
+       __u8    status;
 } __packed;
 
 #define MGMT_EV_PIN_CODE_REQUEST       0x000E
 struct mgmt_ev_pin_code_request {
        struct mgmt_addr_info addr;
-       __u8 secure;
+       __u8    secure;
 } __packed;
 
 #define MGMT_EV_USER_CONFIRM_REQUEST   0x000F
 struct mgmt_ev_user_confirm_request {
        struct mgmt_addr_info addr;
-       __u8 confirm_hint;
-       __le32 value;
+       __u8    confirm_hint;
+       __le32  value;
 } __packed;
 
 #define MGMT_EV_USER_PASSKEY_REQUEST   0x0010
@@ -426,7 +425,7 @@ struct mgmt_ev_user_passkey_request {
 #define MGMT_EV_AUTH_FAILED            0x0011
 struct mgmt_ev_auth_failed {
        struct mgmt_addr_info addr;
-       __u8 status;
+       __u8    status;
 } __packed;
 
 #define MGMT_DEV_FOUND_CONFIRM_NAME    0x01
@@ -435,16 +434,16 @@ struct mgmt_ev_auth_failed {
 #define MGMT_EV_DEVICE_FOUND           0x0012
 struct mgmt_ev_device_found {
        struct mgmt_addr_info addr;
-       __s8 rssi;
-       __u8 flags[4];
-       __le16 eir_len;
-       __u8 eir[0];
+       __s8    rssi;
+       __u8    flags[4];
+       __le16  eir_len;
+       __u8    eir[0];
 } __packed;
 
 #define MGMT_EV_DISCOVERING            0x0013
 struct mgmt_ev_discovering {
-       __u8 type;
-       __u8 discovering;
+       __u8    type;
+       __u8    discovering;
 } __packed;
 
 #define MGMT_EV_DEVICE_BLOCKED         0x0014