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

Commit 220b881a authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

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

parents 80a1e1db 6f5ef998

drivers/bluetooth/btusb.c

+5 −1
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ static struct usb_device_id btusb_table[] = { 
	/* Apple MacBookAir3,1, MacBookAir3,2 */

	{ USB_DEVICE(0x05ac, 0x821b) },



	/* Apple MacBookPro8,2 */

	{ USB_DEVICE(0x05ac, 0x821a) },



	/* AVM BlueFRITZ! USB v2.0 */

	{ USB_DEVICE(0x057c, 0x3800) },
@@ -690,7 +693,8 @@ static int btusb_send_frame(struct sk_buff *skb) 
		break;



	case HCI_ACLDATA_PKT:

		if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)

		if (!data->bulk_tx_ep || (hdev->conn_hash.acl_num < 1 &&

						hdev->conn_hash.le_num < 1))

			return -ENODEV;



		urb = usb_alloc_urb(0, GFP_ATOMIC);

include/net/bluetooth/hci.h

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ enum { 
	HCI_SERVICE_CACHE,

	HCI_LINK_KEYS,

	HCI_DEBUG_KEYS,



	HCI_RESET,

};



/* HCI ioctl defines */

net/bluetooth/hci_core.c

+8 −2
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ static void hci_reset_req(struct hci_dev *hdev, unsigned long opt) 
	BT_DBG("%s %ld", hdev->name, opt);



	/* Reset device */

	set_bit(HCI_RESET, &hdev->flags);

	hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);

}
@@ -212,8 +213,10 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) 
	/* Mandatory initialization */



	/* Reset */

	if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks))

	if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) {

			set_bit(HCI_RESET, &hdev->flags);

			hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);

	}



	/* Read Local Supported Features */

	hci_send_cmd(hdev, HCI_OP_READ_LOCAL_FEATURES, 0, NULL);
@@ -583,6 +586,9 @@ 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)) {

		hci_req_unlock(hdev);

		return 0;
@@ -622,7 +628,6 @@ 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;

	}
@@ -1073,6 +1078,7 @@ static void hci_cmd_timer(unsigned long arg) 


	BT_ERR("%s command tx timeout", hdev->name);

	atomic_set(&hdev->cmd_cnt, 1);

	clear_bit(HCI_RESET, &hdev->flags);

	tasklet_schedule(&hdev->cmd_task);

}

net/bluetooth/hci_event.c

+3 −1
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("%s status 0x%x", hdev->name, status);



	clear_bit(HCI_RESET, &hdev->flags);



	hci_req_complete(hdev, HCI_OP_RESET, status);

}
@@ -1865,7 +1867,7 @@ static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	if (ev->opcode != HCI_OP_NOP)

		del_timer(&hdev->cmd_timer);



	if (ev->ncmd) {

	if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) {

		atomic_set(&hdev->cmd_cnt, 1);

		if (!skb_queue_empty(&hdev->cmd_q))

			tasklet_schedule(&hdev->cmd_task);

net/bluetooth/l2cap_core.c

+3 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,9 @@ int l2cap_ertm_send(struct sock *sk) 
		bt_cb(skb)->tx_seq = pi->next_tx_seq;

		pi->next_tx_seq = (pi->next_tx_seq + 1) % 64;



		if (bt_cb(skb)->retries == 1)

			pi->unacked_frames++;



		pi->frames_sent++;



		if (skb_queue_is_last(TX_QUEUE(sk), skb))