diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-11-17 21:35:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-11-17 21:35:50 -0800 |
| commit | fb7bd0c1d9ff159d6baf1a4f66265ad3f890b7b1 (patch) | |
| tree | 552f25d9b175a986906a5e2f71d0bfd049bf7f07 /include | |
| parent | 1947ca5714a76f53c759a438c4dadf8705e56f2c (diff) | |
| parent | b01b5bbf311edcaf88b28e43db631851310012f6 (diff) | |
Merge http://linux-mh.bkbits.net/bluetooth-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci.h | 2 | ||||
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index ba7d5ef2d2d5..6a2fde5bf873 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -170,6 +170,8 @@ enum { #define HCI_LM_AUTH 0x0002 #define HCI_LM_ENCRYPT 0x0004 #define HCI_LM_TRUSTED 0x0008 +#define HCI_LM_RELIABLE 0x0010 +#define HCI_LM_SECURE 0x0020 /* ----- HCI Commands ---- */ /* OGF & OCF values */ diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index bcbf4411bf69..39ca54fbd041 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -56,6 +56,8 @@ struct l2cap_conninfo { #define L2CAP_LM_AUTH 0x0002 #define L2CAP_LM_ENCRYPT 0x0004 #define L2CAP_LM_TRUSTED 0x0008 +#define L2CAP_LM_RELIABLE 0x0010 +#define L2CAP_LM_SECURE 0x0020 #define L2CAP_QOS 0x04 struct l2cap_qos { |