diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-20 14:07:39 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-20 14:07:39 +1000 |
commit | 469630a4ead1542710d0337675734749a493bea7 (patch) | |
tree | a8b33da64cb7676d16d98820a336da8feaf4e7c0 /include | |
parent | 30dd8def9cb60a5bbabf20fbb2f4740aeecdb46c (diff) | |
parent | 8ca902d709d75ce6d7634036603fff432c9ed6d8 (diff) |
Merge commit 'bluetooth/master'
Diffstat (limited to 'include')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index e919fca1072a..06b072fd6d54 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -190,7 +190,7 @@ struct l2cap_conf_rfc { #define L2CAP_MODE_RETRANS 0x01 #define L2CAP_MODE_FLOWCTL 0x02 #define L2CAP_MODE_ERTM 0x03 -#define L2CAP_MODE_STREAM 0x04 +#define L2CAP_MODE_STREAMING 0x04 struct l2cap_disconn_req { __le16 dcid; @@ -271,9 +271,11 @@ struct l2cap_pinfo { __u16 imtu; __u16 omtu; __u16 flush_to; - __u8 sec_level; + __u8 mode; + __u8 fcs; + __u8 sec_level; __u8 role_switch; - __u8 force_reliable; + __u8 force_reliable; __u8 conf_req[64]; __u8 conf_len; |