diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/net/bluetooth/l2cap.h | |
parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 8242a0ee1f58..87df4e87622d 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
@@ -129,8 +129,10 @@ struct l2cap_conf_rsp { | |||
129 | __u8 data[0]; | 129 | __u8 data[0]; |
130 | } __attribute__ ((packed)); | 130 | } __attribute__ ((packed)); |
131 | 131 | ||
132 | #define L2CAP_CONF_SUCCESS 0x00 | 132 | #define L2CAP_CONF_SUCCESS 0x0000 |
133 | #define L2CAP_CONF_UNACCEPT 0x01 | 133 | #define L2CAP_CONF_UNACCEPT 0x0001 |
134 | #define L2CAP_CONF_REJECT 0x0002 | ||
135 | #define L2CAP_CONF_UNKNOWN 0x0003 | ||
134 | 136 | ||
135 | struct l2cap_conf_opt { | 137 | struct l2cap_conf_opt { |
136 | __u8 type; | 138 | __u8 type; |
@@ -215,6 +217,8 @@ struct l2cap_pinfo { | |||
215 | 217 | ||
216 | __u32 link_mode; | 218 | __u32 link_mode; |
217 | 219 | ||
220 | __u8 conf_req[64]; | ||
221 | __u8 conf_len; | ||
218 | __u8 conf_state; | 222 | __u8 conf_state; |
219 | __u8 conf_retry; | 223 | __u8 conf_retry; |
220 | __u16 conf_mtu; | 224 | __u16 conf_mtu; |