Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Bluetooth: Fix coding style in mgmt.h

Align struct definition in a proper way.

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

+78 -79
+78 -79
include/net/bluetooth/mgmt.h
··· 44 44 #define MGMT_STATUS_INVALID_INDEX 0x11 45 45 46 46 struct mgmt_hdr { 47 - __le16 opcode; 48 - __le16 index; 49 - __le16 len; 47 + __le16 opcode; 48 + __le16 index; 49 + __le16 len; 50 50 } __packed; 51 51 52 52 struct mgmt_addr_info { 53 - bdaddr_t bdaddr; 54 - __u8 type; 53 + bdaddr_t bdaddr; 54 + __u8 type; 55 55 } __packed; 56 56 #define MGMT_ADDR_INFO_SIZE 7 57 57 58 58 #define MGMT_OP_READ_VERSION 0x0001 59 59 #define MGMT_READ_VERSION_SIZE 0 60 60 struct mgmt_rp_read_version { 61 - __u8 version; 62 - __le16 revision; 61 + __u8 version; 62 + __le16 revision; 63 63 } __packed; 64 64 65 65 #define MGMT_OP_READ_COMMANDS 0x0002 66 66 #define MGMT_READ_COMMANDS_SIZE 0 67 67 struct mgmt_rp_read_commands { 68 - __le16 num_commands; 69 - __le16 num_events; 70 - __le16 opcodes[0]; 68 + __le16 num_commands; 69 + __le16 num_events; 70 + __le16 opcodes[0]; 71 71 } __packed; 72 72 73 73 #define MGMT_OP_READ_INDEX_LIST 0x0003 74 74 #define MGMT_READ_INDEX_LIST_SIZE 0 75 75 struct mgmt_rp_read_index_list { 76 - __le16 num_controllers; 77 - __le16 index[0]; 76 + __le16 num_controllers; 77 + __le16 index[0]; 78 78 } __packed; 79 79 80 80 /* Reserve one extra byte for names in management messages so that they ··· 96 96 #define MGMT_OP_READ_INFO 0x0004 97 97 #define MGMT_READ_INFO_SIZE 0 98 98 struct mgmt_rp_read_info { 99 - bdaddr_t bdaddr; 100 - __u8 version; 101 - __le16 manufacturer; 102 - __le32 supported_settings; 103 - __le32 current_settings; 104 - __u8 dev_class[3]; 105 - __u8 name[MGMT_MAX_NAME_LENGTH]; 106 - __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; 99 + bdaddr_t bdaddr; 100 + __u8 version; 101 + __le16 manufacturer; 102 + __le32 supported_settings; 103 + __le32 current_settings; 104 + __u8 dev_class[3]; 105 + __u8 name[MGMT_MAX_NAME_LENGTH]; 106 + __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; 107 107 } __packed; 108 108 109 109 struct mgmt_mode { ··· 116 116 117 117 #define MGMT_OP_SET_DISCOVERABLE 0x0006 118 118 struct mgmt_cp_set_discoverable { 119 - __u8 val; 120 - __u16 timeout; 119 + __u8 val; 120 + __u16 timeout; 121 121 } __packed; 122 122 #define MGMT_SET_DISCOVERABLE_SIZE 3 123 123 ··· 134 134 #define MGMT_OP_SET_HS 0x000C 135 135 136 136 #define MGMT_OP_SET_LE 0x000D 137 - 138 137 #define MGMT_OP_SET_DEV_CLASS 0x000E 139 138 struct mgmt_cp_set_dev_class { 140 - __u8 major; 141 - __u8 minor; 139 + __u8 major; 140 + __u8 minor; 142 141 } __packed; 143 142 #define MGMT_SET_DEV_CLASS_SIZE 2 144 143 145 144 #define MGMT_OP_SET_LOCAL_NAME 0x000F 146 145 struct mgmt_cp_set_local_name { 147 - __u8 name[MGMT_MAX_NAME_LENGTH]; 148 - __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; 146 + __u8 name[MGMT_MAX_NAME_LENGTH]; 147 + __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; 149 148 } __packed; 150 149 #define MGMT_SET_LOCAL_NAME_SIZE 260 151 150 152 151 #define MGMT_OP_ADD_UUID 0x0010 153 152 struct mgmt_cp_add_uuid { 154 - __u8 uuid[16]; 155 - __u8 svc_hint; 153 + __u8 uuid[16]; 154 + __u8 svc_hint; 156 155 } __packed; 157 156 #define MGMT_ADD_UUID_SIZE 17 158 157 159 158 #define MGMT_OP_REMOVE_UUID 0x0011 160 159 struct mgmt_cp_remove_uuid { 161 - __u8 uuid[16]; 160 + __u8 uuid[16]; 162 161 } __packed; 163 162 #define MGMT_REMOVE_UUID_SIZE 16 164 163 165 164 struct mgmt_link_key_info { 166 165 struct mgmt_addr_info addr; 167 - u8 type; 168 - u8 val[16]; 169 - u8 pin_len; 166 + u8 type; 167 + u8 val[16]; 168 + u8 pin_len; 170 169 } __packed; 171 170 172 171 #define MGMT_OP_LOAD_LINK_KEYS 0x0012 173 172 struct mgmt_cp_load_link_keys { 174 - __u8 debug_keys; 175 - __le16 key_count; 176 - struct mgmt_link_key_info keys[0]; 173 + __u8 debug_keys; 174 + __le16 key_count; 175 + struct mgmt_link_key_info keys[0]; 177 176 } __packed; 178 177 #define MGMT_LOAD_LINK_KEYS_SIZE 3 179 178 180 179 struct mgmt_ltk_info { 181 180 struct mgmt_addr_info addr; 182 - __u8 authenticated; 183 - __u8 master; 184 - __u8 enc_size; 185 - __le16 ediv; 186 - __u8 rand[8]; 187 - __u8 val[16]; 181 + __u8 authenticated; 182 + __u8 master; 183 + __u8 enc_size; 184 + __le16 ediv; 185 + __u8 rand[8]; 186 + __u8 val[16]; 188 187 } __packed; 189 188 190 189 #define MGMT_OP_LOAD_LONG_TERM_KEYS 0x0013 191 190 struct mgmt_cp_load_long_term_keys { 192 - __le16 key_count; 193 - struct mgmt_ltk_info keys[0]; 191 + __le16 key_count; 192 + struct mgmt_ltk_info keys[0]; 194 193 } __packed; 195 194 #define MGMT_LOAD_LONG_TERM_KEYS_SIZE 2 196 195 ··· 212 213 #define MGMT_OP_PIN_CODE_REPLY 0x0016 213 214 struct mgmt_cp_pin_code_reply { 214 215 struct mgmt_addr_info addr; 215 - __u8 pin_len; 216 - __u8 pin_code[16]; 216 + __u8 pin_len; 217 + __u8 pin_code[16]; 217 218 } __packed; 218 219 #define MGMT_PIN_CODE_REPLY_SIZE (MGMT_ADDR_INFO_SIZE + 17) 219 220 struct mgmt_rp_pin_code_reply { ··· 228 229 229 230 #define MGMT_OP_SET_IO_CAPABILITY 0x0018 230 231 struct mgmt_cp_set_io_capability { 231 - __u8 io_capability; 232 + __u8 io_capability; 232 233 } __packed; 233 234 #define MGMT_SET_IO_CAPABILITY_SIZE 1 234 235 235 236 #define MGMT_OP_PAIR_DEVICE 0x0019 236 237 struct mgmt_cp_pair_device { 237 238 struct mgmt_addr_info addr; 238 - __u8 io_cap; 239 + __u8 io_cap; 239 240 } __packed; 240 241 #define MGMT_PAIR_DEVICE_SIZE (MGMT_ADDR_INFO_SIZE + 1) 241 242 struct mgmt_rp_pair_device { ··· 273 274 #define MGMT_OP_USER_PASSKEY_REPLY 0x001E 274 275 struct mgmt_cp_user_passkey_reply { 275 276 struct mgmt_addr_info addr; 276 - __le32 passkey; 277 + __le32 passkey; 277 278 } __packed; 278 279 #define MGMT_USER_PASSKEY_REPLY_SIZE (MGMT_ADDR_INFO_SIZE + 4) 279 280 struct mgmt_rp_user_passkey_reply { ··· 289 290 #define MGMT_OP_READ_LOCAL_OOB_DATA 0x0020 290 291 #define MGMT_READ_LOCAL_OOB_DATA_SIZE 0 291 292 struct mgmt_rp_read_local_oob_data { 292 - __u8 hash[16]; 293 - __u8 randomizer[16]; 293 + __u8 hash[16]; 294 + __u8 randomizer[16]; 294 295 } __packed; 295 296 296 297 #define MGMT_OP_ADD_REMOTE_OOB_DATA 0x0021 297 298 struct mgmt_cp_add_remote_oob_data { 298 299 struct mgmt_addr_info addr; 299 - __u8 hash[16]; 300 - __u8 randomizer[16]; 300 + __u8 hash[16]; 301 + __u8 randomizer[16]; 301 302 } __packed; 302 303 #define MGMT_ADD_REMOTE_OOB_DATA_SIZE (MGMT_ADDR_INFO_SIZE + 32) 303 304 ··· 322 323 #define MGMT_OP_CONFIRM_NAME 0x0025 323 324 struct mgmt_cp_confirm_name { 324 325 struct mgmt_addr_info addr; 325 - __u8 name_known; 326 + __u8 name_known; 326 327 } __packed; 327 328 #define MGMT_CONFIRM_NAME_SIZE (MGMT_ADDR_INFO_SIZE + 1) 328 329 struct mgmt_rp_confirm_name { ··· 343 344 344 345 #define MGMT_EV_CMD_COMPLETE 0x0001 345 346 struct mgmt_ev_cmd_complete { 346 - __le16 opcode; 347 - __u8 status; 348 - __u8 data[0]; 347 + __le16 opcode; 348 + __u8 status; 349 + __u8 data[0]; 349 350 } __packed; 350 351 351 352 #define MGMT_EV_CMD_STATUS 0x0002 352 353 struct mgmt_ev_cmd_status { 353 - __le16 opcode; 354 - __u8 status; 354 + __le16 opcode; 355 + __u8 status; 355 356 } __packed; 356 357 357 358 #define MGMT_EV_CONTROLLER_ERROR 0x0003 358 359 struct mgmt_ev_controller_error { 359 - __u8 error_code; 360 + __u8 error_code; 360 361 } __packed; 361 362 362 363 #define MGMT_EV_INDEX_ADDED 0x0004 ··· 367 368 368 369 #define MGMT_EV_CLASS_OF_DEV_CHANGED 0x0007 369 370 struct mgmt_ev_class_of_dev_changed { 370 - __u8 dev_class[3]; 371 + __u8 dev_class[3]; 371 372 }; 372 373 373 374 #define MGMT_EV_LOCAL_NAME_CHANGED 0x0008 374 375 struct mgmt_ev_local_name_changed { 375 - __u8 name[MGMT_MAX_NAME_LENGTH]; 376 - __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; 376 + __u8 name[MGMT_MAX_NAME_LENGTH]; 377 + __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; 377 378 } __packed; 378 379 379 380 #define MGMT_EV_NEW_LINK_KEY 0x0009 380 381 struct mgmt_ev_new_link_key { 381 - __u8 store_hint; 382 + __u8 store_hint; 382 383 struct mgmt_link_key_info key; 383 384 } __packed; 384 385 385 386 #define MGMT_EV_NEW_LONG_TERM_KEY 0x000A 386 387 struct mgmt_ev_new_long_term_key { 387 - __u8 store_hint; 388 + __u8 store_hint; 388 389 struct mgmt_ltk_info key; 389 390 } __packed; 390 391 391 392 #define MGMT_EV_DEVICE_CONNECTED 0x000B 392 393 struct mgmt_ev_device_connected { 393 394 struct mgmt_addr_info addr; 394 - __le32 flags; 395 - __le16 eir_len; 396 - __u8 eir[0]; 395 + __le32 flags; 396 + __le16 eir_len; 397 + __u8 eir[0]; 397 398 } __packed; 398 399 399 400 #define MGMT_EV_DEVICE_DISCONNECTED 0x000C ··· 401 402 #define MGMT_EV_CONNECT_FAILED 0x000D 402 403 struct mgmt_ev_connect_failed { 403 404 struct mgmt_addr_info addr; 404 - __u8 status; 405 + __u8 status; 405 406 } __packed; 406 407 407 408 #define MGMT_EV_PIN_CODE_REQUEST 0x000E 408 409 struct mgmt_ev_pin_code_request { 409 410 struct mgmt_addr_info addr; 410 - __u8 secure; 411 + __u8 secure; 411 412 } __packed; 412 413 413 414 #define MGMT_EV_USER_CONFIRM_REQUEST 0x000F 414 415 struct mgmt_ev_user_confirm_request { 415 416 struct mgmt_addr_info addr; 416 - __u8 confirm_hint; 417 - __le32 value; 417 + __u8 confirm_hint; 418 + __le32 value; 418 419 } __packed; 419 420 420 421 #define MGMT_EV_USER_PASSKEY_REQUEST 0x0010 ··· 425 426 #define MGMT_EV_AUTH_FAILED 0x0011 426 427 struct mgmt_ev_auth_failed { 427 428 struct mgmt_addr_info addr; 428 - __u8 status; 429 + __u8 status; 429 430 } __packed; 430 431 431 432 #define MGMT_DEV_FOUND_CONFIRM_NAME 0x01 ··· 434 435 #define MGMT_EV_DEVICE_FOUND 0x0012 435 436 struct mgmt_ev_device_found { 436 437 struct mgmt_addr_info addr; 437 - __s8 rssi; 438 - __u8 flags[4]; 439 - __le16 eir_len; 440 - __u8 eir[0]; 438 + __s8 rssi; 439 + __u8 flags[4]; 440 + __le16 eir_len; 441 + __u8 eir[0]; 441 442 } __packed; 442 443 443 444 #define MGMT_EV_DISCOVERING 0x0013 444 445 struct mgmt_ev_discovering { 445 - __u8 type; 446 - __u8 discovering; 446 + __u8 type; 447 + __u8 discovering; 447 448 } __packed; 448 449 449 450 #define MGMT_EV_DEVICE_BLOCKED 0x0014