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

Commit 73d0d3c8 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Move HCI_RUNNING check into hci_send_frame 



In all callbacks for hdev->send the status of HCI_RUNNING is checked. So
instead of repeating that code in every driver, move the check into the
hci_send_frame function before calling hdev->send.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 4a3f95b7

drivers/bluetooth/bfusb.c

+0 −3
Original line number Diff line number Diff line
@@ -479,9 +479,6 @@ static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("hdev %p skb %p type %d len %d", hdev, skb, bt_cb(skb)->pkt_type, skb->len);



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

drivers/bluetooth/bpa10x.c

+0 −3
Original line number Diff line number Diff line
@@ -360,9 +360,6 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


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



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	skb->dev = (void *) hdev;



	urb = usb_alloc_urb(0, GFP_ATOMIC);

drivers/bluetooth/btmrvl_main.c

+0 −7
Original line number Diff line number Diff line
@@ -436,13 +436,6 @@ static int btmrvl_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("type=%d, len=%d", skb->pkt_type, skb->len);



	if (!test_bit(HCI_RUNNING, &hdev->flags)) {

		BT_ERR("Failed testing HCI_RUNING, flags=%lx", hdev->flags);

		print_hex_dump_bytes("data: ", DUMP_PREFIX_OFFSET,

							skb->data, skb->len);

		return -EBUSY;

	}



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

drivers/bluetooth/btsdio.c

+0 −3
Original line number Diff line number Diff line
@@ -261,9 +261,6 @@ static int btsdio_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


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



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

drivers/bluetooth/btusb.c

+0 −6
Original line number Diff line number Diff line
@@ -1156,9 +1156,6 @@ static int btusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


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



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		urb = alloc_ctrl_urb(hdev, skb);
@@ -1843,9 +1840,6 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb) 


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



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		if (test_bit(BTUSB_BOOTLOADER, &data->flags)) {