Commit 7c7327d9 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6:
  Bluetooth: Don't trigger disconnect timeout for security mode 3 pairing
  Bluetooth: Don't use hci_acl_connect_cancel() for incoming connections
  Bluetooth: Fix wrong module refcount when connection setup fails

Another case of me handling the fallout from Davem's unfortunate
addiction to shuffleboard.

Won't anybody think of the children? Join the anti-shuffleboard league
today!
parents 40f293ff 3d7a9d1c
...@@ -171,10 +171,8 @@ static void hci_conn_timeout(unsigned long arg) ...@@ -171,10 +171,8 @@ static void hci_conn_timeout(unsigned long arg)
switch (conn->state) { switch (conn->state) {
case BT_CONNECT: case BT_CONNECT:
case BT_CONNECT2: case BT_CONNECT2:
if (conn->type == ACL_LINK) if (conn->type == ACL_LINK && conn->out)
hci_acl_connect_cancel(conn); hci_acl_connect_cancel(conn);
else
hci_acl_disconn(conn, 0x13);
break; break;
case BT_CONFIG: case BT_CONFIG:
case BT_CONNECTED: case BT_CONNECTED:
...@@ -292,6 +290,8 @@ int hci_conn_del(struct hci_conn *conn) ...@@ -292,6 +290,8 @@ int hci_conn_del(struct hci_conn *conn)
hci_conn_del_sysfs(conn); hci_conn_del_sysfs(conn);
hci_dev_put(hdev);
return 0; return 0;
} }
......
...@@ -1493,7 +1493,7 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff ...@@ -1493,7 +1493,7 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff
hci_dev_lock(hdev); hci_dev_lock(hdev);
conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
if (conn) { if (conn && conn->state == BT_CONNECTED) {
hci_conn_hold(conn); hci_conn_hold(conn);
conn->disc_timeout = HCI_PAIRING_TIMEOUT; conn->disc_timeout = HCI_PAIRING_TIMEOUT;
hci_conn_put(conn); hci_conn_put(conn);
......
...@@ -99,6 +99,8 @@ static void add_conn(struct work_struct *work) ...@@ -99,6 +99,8 @@ static void add_conn(struct work_struct *work)
BT_ERR("Failed to register connection device"); BT_ERR("Failed to register connection device");
return; return;
} }
hci_dev_hold(hdev);
} }
/* /*
...@@ -134,6 +136,7 @@ static void del_conn(struct work_struct *work) ...@@ -134,6 +136,7 @@ static void del_conn(struct work_struct *work)
device_del(&conn->dev); device_del(&conn->dev);
put_device(&conn->dev); put_device(&conn->dev);
hci_dev_put(hdev); hci_dev_put(hdev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment