diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-02 21:58:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-02 21:58:21 +0100 |
| commit | 6c032edc8a338f7a5d7bbd3dd8a08ac80d37dd86 (patch) | |
| tree | c07d1788b0c6f3973a4afc8c61c05712cb6fa100 /include/net/bluetooth/l2cap.h | |
| parent | geneve: Add Geneve GRO support (diff) | |
| parent | Bluetooth: Add timing information to ECDH test case runs (diff) | |
| download | linux-6c032edc8a338f7a5d7bbd3dd8a08ac80d37dd86.tar.xz linux-6c032edc8a338f7a5d7bbd3dd8a08ac80d37dd86.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg say:
====================
pull request: bluetooth-next 2014-12-31
Here's the first batch of bluetooth patches for 3.20.
- Cleanups & fixes to ieee802154 drivers
- Fix synchronization of mgmt commands with respective HCI commands
- Add self-tests for LE pairing crypto functionality
- Remove 'BlueFritz!' specific handling from core using a new quirk flag
- Public address configuration support for ath3012
- Refactor debugfs support into a dedicated file
- Initial support for LE Data Length Extension feature from Bluetooth 4.2
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index d1bb342d083f..2239a3753092 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -248,6 +248,7 @@ struct l2cap_conn_rsp { #define L2CAP_PSM_SDP 0x0001 #define L2CAP_PSM_RFCOMM 0x0003 #define L2CAP_PSM_3DSP 0x0021 +#define L2CAP_PSM_IPSP 0x0023 /* 6LoWPAN */ /* channel identifier */ #define L2CAP_CID_SIGNALING 0x0001 |