Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/bluetooth/hci_conn.c

+3 −3
Original line number Diff line number Diff line
@@ -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:
@@ -292,6 +290,8 @@ int hci_conn_del(struct hci_conn *conn) 


	hci_conn_del_sysfs(conn);



	hci_dev_put(hdev);



	return 0;

}

net/bluetooth/hci_event.c

+1 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_lock(hdev);



	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);

	if (conn) {

	if (conn && conn->state == BT_CONNECTED) {

		hci_conn_hold(conn);

		conn->disc_timeout = HCI_PAIRING_TIMEOUT;

		hci_conn_put(conn);

net/bluetooth/hci_sysfs.c

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ static void add_conn(struct work_struct *work) 
		BT_ERR("Failed to register connection device");

		return;

	}



	hci_dev_hold(hdev);

}



/*
@@ -134,6 +136,7 @@ static void del_conn(struct work_struct *work) 


	device_del(&conn->dev);

	put_device(&conn->dev);



	hci_dev_put(hdev);

}