aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2012-03-06 21:48:33 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2012-03-06 22:04:25 -0500
commitf64b993f44c3a5fe709b276ac5652d006afe9d33 (patch)
treedd9aa6663e497d0e370a37eabfb2c385d684ac04 /include/net
parent044e1247344d7ff0dbdb1e7edd80d859a8c19aa6 (diff)
Bluetooth: Fix coding style in all .h files
Proper align the struct definitions. Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/hci.h8
-rw-r--r--include/net/bluetooth/hci_core.h10
-rw-r--r--include/net/bluetooth/hci_mon.h8
-rw-r--r--include/net/bluetooth/l2cap.h52
4 files changed, 39 insertions, 39 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 3acbebfb22b9..344b0f972828 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -693,8 +693,8 @@ struct hci_cp_host_buffer_size {
693 693
694#define HCI_OP_WRITE_EIR 0x0c52 694#define HCI_OP_WRITE_EIR 0x0c52
695struct hci_cp_write_eir { 695struct hci_cp_write_eir {
696 __u8 fec; 696 __u8 fec;
697 __u8 data[HCI_MAX_EIR_LENGTH]; 697 __u8 data[HCI_MAX_EIR_LENGTH];
698} __packed; 698} __packed;
699 699
700#define HCI_OP_READ_SSP_MODE 0x0c55 700#define HCI_OP_READ_SSP_MODE 0x0c55
@@ -725,8 +725,8 @@ struct hci_rp_read_flow_control_mode {
725 725
726#define HCI_OP_WRITE_LE_HOST_SUPPORTED 0x0c6d 726#define HCI_OP_WRITE_LE_HOST_SUPPORTED 0x0c6d
727struct hci_cp_write_le_host_supported { 727struct hci_cp_write_le_host_supported {
728 __u8 le; 728 __u8 le;
729 __u8 simul; 729 __u8 simul;
730} __packed; 730} __packed;
731 731
732#define HCI_OP_READ_LOCAL_VERSION 0x1001 732#define HCI_OP_READ_LOCAL_VERSION 0x1001
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 25cb0a15b579..cbbf68a8510d 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -57,7 +57,7 @@ struct inquiry_entry {
57}; 57};
58 58
59struct discovery_state { 59struct discovery_state {
60 int type; 60 int type;
61 enum { 61 enum {
62 DISCOVERY_STOPPED, 62 DISCOVERY_STOPPED,
63 DISCOVERY_STARTING, 63 DISCOVERY_STARTING,
@@ -65,10 +65,10 @@ struct discovery_state {
65 DISCOVERY_RESOLVING, 65 DISCOVERY_RESOLVING,
66 DISCOVERY_STOPPING, 66 DISCOVERY_STOPPING,
67 } state; 67 } state;
68 struct list_head all; /* All devices found during inquiry */ 68 struct list_head all; /* All devices found during inquiry */
69 struct list_head unknown; /* Name state not known */ 69 struct list_head unknown; /* Name state not known */
70 struct list_head resolve; /* Name needs to be resolved */ 70 struct list_head resolve; /* Name needs to be resolved */
71 __u32 timestamp; 71 __u32 timestamp;
72}; 72};
73 73
74struct hci_conn_hash { 74struct hci_conn_hash {
diff --git a/include/net/bluetooth/hci_mon.h b/include/net/bluetooth/hci_mon.h
index 07a25c92502c..77d1e5764185 100644
--- a/include/net/bluetooth/hci_mon.h
+++ b/include/net/bluetooth/hci_mon.h
@@ -41,10 +41,10 @@ struct hci_mon_hdr {
41#define HCI_MON_SCO_RX_PKT 7 41#define HCI_MON_SCO_RX_PKT 7
42 42
43struct hci_mon_new_index { 43struct hci_mon_new_index {
44 __u8 type; 44 __u8 type;
45 __u8 bus; 45 __u8 bus;
46 bdaddr_t bdaddr; 46 bdaddr_t bdaddr;
47 char name[8]; 47 char name[8];
48} __packed; 48} __packed;
49#define HCI_MON_NEW_INDEX_SIZE 16 49#define HCI_MON_NEW_INDEX_SIZE 16
50 50
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index e4669d0230c5..9b242c6bf55b 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -492,16 +492,16 @@ struct l2cap_chan {
492 struct sk_buff_head srej_q; 492 struct sk_buff_head srej_q;
493 struct list_head srej_l; 493 struct list_head srej_l;
494 494
495 struct list_head list; 495 struct list_head list;
496 struct list_head global_l; 496 struct list_head global_l;
497 497
498 void *data; 498 void *data;
499 struct l2cap_ops *ops; 499 struct l2cap_ops *ops;
500 struct mutex lock; 500 struct mutex lock;
501}; 501};
502 502
503struct l2cap_ops { 503struct l2cap_ops {
504 char *name; 504 char *name;
505 505
506 struct l2cap_chan *(*new_connection) (void *data); 506 struct l2cap_chan *(*new_connection) (void *data);
507 int (*recv) (void *data, struct sk_buff *skb); 507 int (*recv) (void *data, struct sk_buff *skb);
@@ -513,35 +513,35 @@ struct l2cap_ops {
513}; 513};
514 514
515struct l2cap_conn { 515struct l2cap_conn {
516 struct hci_conn *hcon; 516 struct hci_conn *hcon;
517 struct hci_chan *hchan; 517 struct hci_chan *hchan;
518 518
519 bdaddr_t *dst; 519 bdaddr_t *dst;
520 bdaddr_t *src; 520 bdaddr_t *src;
521 521
522 unsigned int mtu; 522 unsigned int mtu;
523 523
524 __u32 feat_mask; 524 __u32 feat_mask;
525 __u8 fixed_chan_mask; 525 __u8 fixed_chan_mask;
526 526
527 __u8 info_state; 527 __u8 info_state;
528 __u8 info_ident; 528 __u8 info_ident;
529 529
530 struct delayed_work info_timer; 530 struct delayed_work info_timer;
531 531
532 spinlock_t lock; 532 spinlock_t lock;
533 533
534 struct sk_buff *rx_skb; 534 struct sk_buff *rx_skb;
535 __u32 rx_len; 535 __u32 rx_len;
536 __u8 tx_ident; 536 __u8 tx_ident;
537 537
538 __u8 disc_reason; 538 __u8 disc_reason;
539 539
540 struct delayed_work security_timer; 540 struct delayed_work security_timer;
541 struct smp_chan *smp_chan; 541 struct smp_chan *smp_chan;
542 542
543 struct list_head chan_l; 543 struct list_head chan_l;
544 struct mutex chan_lock; 544 struct mutex chan_lock;
545}; 545};
546 546
547#define L2CAP_INFO_CL_MTU_REQ_SENT 0x01 547#define L2CAP_INFO_CL_MTU_REQ_SENT 0x01
@@ -556,9 +556,9 @@ struct l2cap_conn {
556#define l2cap_pi(sk) ((struct l2cap_pinfo *) sk) 556#define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
557 557
558struct l2cap_pinfo { 558struct l2cap_pinfo {
559 struct bt_sock bt; 559 struct bt_sock bt;
560 struct l2cap_chan *chan; 560 struct l2cap_chan *chan;
561 struct sk_buff *rx_busy_skb; 561 struct sk_buff *rx_busy_skb;
562}; 562};
563 563
564enum { 564enum {