diff options
author | David S. Miller <davem@davemloft.net> | 2016-01-30 15:32:42 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-01-30 15:32:42 -0800 |
commit | 53729eb174c1589f9185340ffe8c10b3f39f3ef3 (patch) | |
tree | f72309f53abf3a5b99d1e56270291c6abaeede3d /include | |
parent | 99b4dd9f2423130875ac486fe587cd103c64f753 (diff) | |
parent | cff10ce7b4f02718ffd25e3914e60559f5ef6ca0 (diff) | |
download | linux-stable-53729eb174c1589f9185340ffe8c10b3f39f3ef3.tar.gz linux-stable-53729eb174c1589f9185340ffe8c10b3f39f3ef3.tar.bz2 linux-stable-53729eb174c1589f9185340ffe8c10b3f39f3ef3.zip |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2016-01-30
Here's a set of important Bluetooth fixes for the 4.5 kernel:
- Two fixes to 6LoWPAN code (one fixing a potential crash)
- Fix LE pairing with devices using both public and random addresses
- Fix allocation of dynamic LE PSM values
- Fix missing COMPATIBLE_IOCTL for UART line discipline
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 52899291f401..5ee3c689c863 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -252,6 +252,12 @@ struct l2cap_conn_rsp { #define L2CAP_PSM_3DSP 0x0021 #define L2CAP_PSM_IPSP 0x0023 /* 6LoWPAN */ +#define L2CAP_PSM_DYN_START 0x1001 +#define L2CAP_PSM_DYN_END 0xffff +#define L2CAP_PSM_AUTO_END 0x10ff +#define L2CAP_PSM_LE_DYN_START 0x0080 +#define L2CAP_PSM_LE_DYN_END 0x00ff + /* channel identifier */ #define L2CAP_CID_SIGNALING 0x0001 #define L2CAP_CID_CONN_LESS 0x0002 |