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

Bluetooth: Remove unneeded recv_event variable 



Now that the synchronous HCI requests use the new API and a new private
variable the recv_evt member of hci_dev is no-longer needed. This patch
removes it.

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

include/net/bluetooth/hci_core.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -326,7 +326,6 @@ struct hci_dev { 
	struct sk_buff_head	raw_q;

	struct sk_buff_head	raw_q;

	struct sk_buff_head	cmd_q;

	struct sk_buff_head	cmd_q;





	struct sk_buff		*recv_evt;

	struct sk_buff		*sent_cmd;

	struct sk_buff		*sent_cmd;

	struct sk_buff		*reassembly[NUM_REASSEMBLY];

	struct sk_buff		*reassembly[NUM_REASSEMBLY];

net/bluetooth/hci_core.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1690,9 +1690,6 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
		hdev->sent_cmd = NULL;

		hdev->sent_cmd = NULL;

	}

	}





	kfree_skb(hdev->recv_evt);

	hdev->recv_evt = NULL;



	/* After this point our queues are empty

	/* After this point our queues are empty

	 * and no tasks are scheduled. */

	 * and no tasks are scheduled. */

	hdev->close(hdev);

	hdev->close(hdev);

net/bluetooth/hci_event.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -5052,18 +5052,6 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) 
	u8 status = 0, event = hdr->evt;

	u8 status = 0, event = hdr->evt;

	u16 opcode = HCI_OP_NOP;

	u16 opcode = HCI_OP_NOP;





	hci_dev_lock(hdev);



	/* Received events are (currently) only needed when a request is

	 * ongoing so avoid unnecessary memory allocation.

	 */

	if (hci_req_pending(hdev)) {

		kfree_skb(hdev->recv_evt);

		hdev->recv_evt = skb_clone(skb, GFP_KERNEL);

	}



	hci_dev_unlock(hdev);



	if (hdev->sent_cmd && bt_cb(hdev->sent_cmd)->req.event == event) {

	if (hdev->sent_cmd && bt_cb(hdev->sent_cmd)->req.event == event) {

		struct hci_command_hdr *cmd_hdr = (void *) hdev->sent_cmd->data;

		struct hci_command_hdr *cmd_hdr = (void *) hdev->sent_cmd->data;

		opcode = __le16_to_cpu(cmd_hdr->opcode);

		opcode = __le16_to_cpu(cmd_hdr->opcode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE