diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
| commit | 63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72 (patch) | |
| tree | 380eb052c1b93ce11535ffab7f29c4e3d02a7697 /include/net/bluetooth/bluetooth.h | |
| parent | 43be63662db56de3f87cb4a86bfe062a9797be65 (diff) | |
| parent | b1fb06830dc870d862f7f80e276130c0ab84d59f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index a04f8463ac7..3ad5390a4dd 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -53,6 +53,17 @@ #define SOL_SCO 17 #define SOL_RFCOMM 18 +#define BT_SECURITY 4 +struct bt_security { + __u8 level; +}; +#define BT_SECURITY_SDP 0 +#define BT_SECURITY_LOW 1 +#define BT_SECURITY_MEDIUM 2 +#define BT_SECURITY_HIGH 3 + +#define BT_DEFER_SETUP 7 + #define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg) #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg) #define BT_DBG(fmt, arg...) pr_debug("%s: " fmt "\n" , __func__ , ## arg) @@ -108,6 +119,7 @@ struct bt_sock { bdaddr_t dst; struct list_head accept_q; struct sock *parent; + u32 defer_setup; }; struct bt_sock_list { |