vserver 1.9.5.x5

[linux-2.6.git] / include / net / bluetooth / l2cap.h

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index bcbf441..490a656 100644 (file)
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -38,17 +38,19 @@ struct sockaddr_l2 {
        bdaddr_t        l2_bdaddr;
 };
 
-/* Socket options */
+/* L2CAP socket options */
 #define L2CAP_OPTIONS  0x01
 struct l2cap_options {
        __u16 omtu;
        __u16 imtu;
        __u16 flush_to;
+       __u8  mode;
 };
 
-#define L2CAP_CONNINFO  0x02
+#define L2CAP_CONNINFO 0x02
 struct l2cap_conninfo {
        __u16 hci_handle;
+       __u8  dev_class[3];
 };
 
 #define L2CAP_LM       0x03
@@ -56,20 +58,8 @@ struct l2cap_conninfo {
 #define L2CAP_LM_AUTH          0x0002
 #define L2CAP_LM_ENCRYPT       0x0004
 #define L2CAP_LM_TRUSTED       0x0008
-
-#define L2CAP_QOS      0x04
-struct l2cap_qos {
-       __u16 service_type;
-       __u32 token_rate;
-       __u32 token_bucket_size;
-       __u32 peak_bandwidth;
-       __u32 latency;
-       __u32 delay_variation;
-};
-
-#define L2CAP_SERV_NO_TRAFFIC  0x00
-#define L2CAP_SERV_BEST_EFFORT 0x01
-#define L2CAP_SERV_GUARANTEED  0x02
+#define L2CAP_LM_RELIABLE      0x0010
+#define L2CAP_LM_SECURE                0x0020
 
 /* L2CAP command codes */
 #define L2CAP_COMMAND_REJ 0x01
@@ -152,6 +142,7 @@ struct l2cap_conf_opt {
 #define L2CAP_CONF_MTU         0x01
 #define L2CAP_CONF_FLUSH_TO    0x02
 #define L2CAP_CONF_QOS         0x03
+#define L2CAP_CONF_RFC         0x04
 
 #define L2CAP_CONF_MAX_SIZE    22
 
@@ -196,11 +187,11 @@ struct l2cap_conn {
 
        bdaddr_t        *dst;
        bdaddr_t        *src;
-       
+
        unsigned int    mtu;
 
        spinlock_t      lock;
-       
+
        struct sk_buff *rx_skb;
        __u32           rx_len;
        __u8            rx_ident;
@@ -220,7 +211,7 @@ struct l2cap_pinfo {
        __u16           imtu;
        __u16           omtu;
        __u16           flush_to;
-       
+
        __u32           link_mode;
 
        __u8            conf_state;