gss_krb5: add support for triple-des encryption

[safe/jmp/linux-2.6] / net / bluetooth / hci_conn.c

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 96281a1..b10e3cd 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -171,10 +171,8 @@ static void hci_conn_timeout(unsigned long arg)
        switch (conn->state) {
        case BT_CONNECT:
        case BT_CONNECT2:
-               if (conn->type == ACL_LINK)
+               if (conn->type == ACL_LINK && conn->out)
                        hci_acl_connect_cancel(conn);
-               else
-                       hci_acl_disconn(conn, 0x13);
                break;
        case BT_CONFIG:
        case BT_CONNECTED:
@@ -213,8 +211,10 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
        conn->type  = type;
        conn->mode  = HCI_CM_ACTIVE;
        conn->state = BT_OPEN;
+       conn->auth_type = HCI_AT_GENERAL_BONDING;
 
        conn->power_save = 1;
+       conn->disc_timeout = HCI_DISCONN_TIMEOUT;
 
        switch (type) {
        case ACL_LINK:
@@ -247,6 +247,10 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
        if (hdev->notify)
                hdev->notify(hdev, HCI_NOTIFY_CONN_ADD);
 
+       atomic_set(&conn->devref, 0);
+
+       hci_conn_init_sysfs(conn);
+
        tasklet_enable(&hdev->tx_task);
 
        return conn;
@@ -287,6 +291,10 @@ int hci_conn_del(struct hci_conn *conn)
 
        skb_queue_purge(&conn->data_q);
 
+       hci_conn_put_device(conn);
+
+       hci_dev_put(hdev);
+
        return 0;
 }
 
@@ -369,6 +377,9 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8
 
        if (acl->state == BT_CONNECTED &&
                        (sco->state == BT_OPEN || sco->state == BT_CLOSED)) {
+               acl->power_save = 1;
+               hci_conn_enter_active_mode(acl);
+
                if (lmp_esco_capable(hdev))
                        hci_setup_sync(sco, acl->handle);
                else
@@ -397,12 +408,13 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 {
        BT_DBG("conn %p", conn);
 
-       if (sec_level > conn->sec_level) {
+       if (sec_level > conn->sec_level)
                conn->sec_level = sec_level;
-               conn->auth_type = auth_type;
-       } else if (conn->link_mode & HCI_LM_AUTH)
+       else if (conn->link_mode & HCI_LM_AUTH)
                return 1;
 
+       conn->auth_type = auth_type;
+
        if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {
                struct hci_cp_auth_requested cp;
                cp.handle = cpu_to_le16(conn->handle);
@@ -418,18 +430,12 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 {
        BT_DBG("conn %p", conn);
 
-       if (conn->auth_type == 0xff)
-               conn->auth_type = auth_type;
-
        if (sec_level == BT_SECURITY_SDP)
                return 1;
 
-       if (sec_level == BT_SECURITY_LOW) {
-               if (conn->ssp_mode > 0 && conn->hdev->ssp_mode > 0)
-                       return hci_conn_auth(conn, sec_level, auth_type);
-               else
-                       return 1;
-       }
+       if (sec_level == BT_SECURITY_LOW &&
+                               (!conn->ssp_mode || !conn->hdev->ssp_mode))
+               return 1;
 
        if (conn->link_mode & HCI_LM_ENCRYPT)
                return hci_conn_auth(conn, sec_level, auth_type);
@@ -562,8 +568,6 @@ void hci_conn_hash_flush(struct hci_dev *hdev)
 
                c->state = BT_CLOSED;
 
-               hci_conn_del_sysfs(c);
-
                hci_proto_disconn_cfm(c, 0x16);
                hci_conn_del(c);
        }
@@ -585,6 +589,19 @@ void hci_conn_check_pending(struct hci_dev *hdev)
        hci_dev_unlock(hdev);
 }
 
+void hci_conn_hold_device(struct hci_conn *conn)
+{
+       atomic_inc(&conn->devref);
+}
+EXPORT_SYMBOL(hci_conn_hold_device);
+
+void hci_conn_put_device(struct hci_conn *conn)
+{
+       if (atomic_dec_and_test(&conn->devref))
+               hci_conn_del_sysfs(conn);
+}
+EXPORT_SYMBOL(hci_conn_put_device);
+
 int hci_get_conn_list(void __user *arg)
 {
        struct hci_conn_list_req req, *cl;