diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-12-05 19:12:24 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-12-05 19:12:24 (GMT) |
commit | f700076a9d1024a8184a7b6642edebd53a46a481 (patch) | |
tree | 4383ac2a2e624a0757f658b406ac335d89c829c9 /include/net/bluetooth/l2cap.h | |
parent | 7be6ff65ce7df4fc6bfd87d261a723a5558fee72 (diff) | |
parent | 5a34bd5f5d8119def4feb1d2b4e3906b71059416 (diff) | |
download | linux-f700076a9d1024a8184a7b6642edebd53a46a481.tar.xz |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 061e648..eee3ef5 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -141,6 +141,7 @@ struct l2cap_conninfo { #define L2CAP_FC_ATT 0x10 #define L2CAP_FC_SIG_LE 0x20 #define L2CAP_FC_SMP_LE 0x40 +#define L2CAP_FC_SMP_BREDR 0x80 /* L2CAP Control Field bit masks */ #define L2CAP_CTRL_SAR 0xC000 @@ -255,6 +256,7 @@ struct l2cap_conn_rsp { #define L2CAP_CID_ATT 0x0004 #define L2CAP_CID_LE_SIGNALING 0x0005 #define L2CAP_CID_SMP 0x0006 +#define L2CAP_CID_SMP_BREDR 0x0007 #define L2CAP_CID_DYN_START 0x0040 #define L2CAP_CID_DYN_END 0xffff #define L2CAP_CID_LE_DYN_END 0x007f @@ -619,8 +621,8 @@ struct l2cap_conn { unsigned int mtu; __u32 feat_mask; - __u8 fixed_chan_mask; - bool hs_enabled; + __u8 remote_fixed_chan; + __u8 local_fixed_chan; __u8 info_state; __u8 info_ident; |