lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Use __packed annotation

Browse Source 
To make net/ and include/net/ code consistent use __packed instead of
__attribute__ ((packed)). Bluetooth subsystem was one of the last net
subsys still using __attribute__ ((packed)).

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Gustavo F. Padovan
2010-07-19 02:00:13 -03:00
committed by Marcel Holtmann
parent d1c4a17d58
commit 66c853cc21
4 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/net/bluetooth/l2cap.h
View File

@@ -131,31 +131,31 @@ struct l2cap_conninfo {
struct l2cap_hdr {
__le16 len;
__le16 cid;
} __attribute__ ((packed));
} __packed;
#define L2CAP_HDR_SIZE 4
struct l2cap_cmd_hdr {
__u8 code;
__u8 ident;
__le16 len;
} __attribute__ ((packed));
} __packed;
#define L2CAP_CMD_HDR_SIZE 4
struct l2cap_cmd_rej {
__le16 reason;
} __attribute__ ((packed));
} __packed;
struct l2cap_conn_req {
__le16 psm;
__le16 scid;
} __attribute__ ((packed));
} __packed;
struct l2cap_conn_rsp {
__le16 dcid;
__le16 scid;
__le16 result;
__le16 status;
} __attribute__ ((packed));
} __packed;
/* channel indentifier */
#define L2CAP_CID_SIGNALING 0x0001
@@ -179,14 +179,14 @@ struct l2cap_conf_req {
__le16 dcid;
__le16 flags;
__u8 data[0];
} __attribute__ ((packed));
} __packed;
struct l2cap_conf_rsp {
__le16 scid;
__le16 flags;
__le16 result;
__u8 data[0];
} __attribute__ ((packed));
} __packed;
#define L2CAP_CONF_SUCCESS 0x0000
#define L2CAP_CONF_UNACCEPT 0x0001
@@ -197,7 +197,7 @@ struct l2cap_conf_opt {
__u8 type;
__u8 len;
__u8 val[0];
} __attribute__ ((packed));
} __packed;
#define L2CAP_CONF_OPT_SIZE 2
#define L2CAP_CONF_HINT 0x80
@@ -218,7 +218,7 @@ struct l2cap_conf_rfc {
__le16 retrans_timeout;
__le16 monitor_timeout;
__le16 max_pdu_size;
} __attribute__ ((packed));
} __packed;
#define L2CAP_MODE_BASIC 0x00
#define L2CAP_MODE_RETRANS 0x01
@@ -229,22 +229,22 @@ struct l2cap_conf_rfc {
struct l2cap_disconn_req {
__le16 dcid;
__le16 scid;
} __attribute__ ((packed));
} __packed;
struct l2cap_disconn_rsp {
__le16 dcid;
__le16 scid;
} __attribute__ ((packed));
} __packed;
struct l2cap_info_req {
__le16 type;
} __attribute__ ((packed));
} __packed;
struct l2cap_info_rsp {
__le16 type;
__le16 result;
__u8 data[0];
} __attribute__ ((packed));
} __packed;
/* info type */
#define L2CAP_IT_CL_MTU 0x0001