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

Commit 10e99777 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

parents 2232d31b a429b519

net/bluetooth/hci_core.c

+2 −3
Original line number Diff line number Diff line
@@ -587,10 +587,8 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	hci_req_cancel(hdev, ENODEV);

	hci_req_lock(hdev);



	/* Stop timer, it might be running */

	del_timer_sync(&hdev->cmd_timer);



	if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {

		del_timer_sync(&hdev->cmd_timer);

		hci_req_unlock(hdev);

		return 0;

	}
@@ -629,6 +627,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) 


	/* Drop last sent command */

	if (hdev->sent_cmd) {

		del_timer_sync(&hdev->cmd_timer);

		kfree_skb(hdev->sent_cmd);

		hdev->sent_cmd = NULL;

	}

net/bluetooth/hci_event.c

+0 −2
Original line number Diff line number Diff line
@@ -2387,8 +2387,6 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s 
	if (!conn)

		goto unlock;



	hci_conn_hold(conn);



	conn->remote_cap = ev->capability;

	conn->remote_oob = ev->oob_data;

	conn->remote_auth = ev->authentication;

net/bluetooth/l2cap_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,7 @@ static void l2cap_retransmit_one_frame(struct sock *sk, u8 tx_seq) 
	tx_skb = skb_clone(skb, GFP_ATOMIC);

	bt_cb(skb)->retries++;

	control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);

	control &= L2CAP_CTRL_SAR;



	if (pi->conn_state & L2CAP_CONN_SEND_FBIT) {

		control |= L2CAP_CTRL_FINAL;

net/bluetooth/sco.c

+9 −0
Original line number Diff line number Diff line
@@ -369,6 +369,15 @@ static void __sco_sock_close(struct sock *sk) 


	case BT_CONNECTED:

	case BT_CONFIG:

		if (sco_pi(sk)->conn) {

			sk->sk_state = BT_DISCONN;

			sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);

			hci_conn_put(sco_pi(sk)->conn->hcon);

			sco_pi(sk)->conn = NULL;

		} else

			sco_chan_del(sk, ECONNRESET);

		break;



	case BT_CONNECT:

	case BT_DISCONN:

		sco_chan_del(sk, ECONNRESET);