Commit 176cbece authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: hci_core: Don't use hci_prepare_cmd 



This replaces the instance of hci_prepare_cmd with hci_cmd_sync_alloc
since the former is part of hci_request.c which is considered
deprecated.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 92048ab2

include/net/bluetooth/hci_sync.h

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ struct hci_cmd_sync_work_entry { 
};



struct adv_info;



struct sk_buff *hci_cmd_sync_alloc(struct hci_dev *hdev, u16 opcode, u32 plen,

				   const void *param, struct sock *sk);



/* Function with sync suffix shall not be called with hdev->lock held as they

 * wait the command to complete and in the meantime an event could be received

 * which could attempt to acquire hdev->lock causing a deadlock.

net/bluetooth/hci_core.c

+2 −2
Original line number Diff line number Diff line
@@ -3054,7 +3054,7 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, 


	BT_DBG("%s opcode 0x%4.4x plen %d", hdev->name, opcode, plen);



	skb = hci_prepare_cmd(hdev, opcode, plen, param);

	skb = hci_cmd_sync_alloc(hdev, opcode, plen, param, NULL);

	if (!skb) {

		bt_dev_err(hdev, "no memory for command");

		return -ENOMEM;
@@ -3089,7 +3089,7 @@ int __hci_cmd_send(struct hci_dev *hdev, u16 opcode, u32 plen, 
		return -EINVAL;

	}



	skb = hci_prepare_cmd(hdev, opcode, plen, param);

	skb = hci_cmd_sync_alloc(hdev, opcode, plen, param, NULL);

	if (!skb) {

		bt_dev_err(hdev, "no memory for command (opcode 0x%4.4x)",

			   opcode);

net/bluetooth/hci_sync.c

+2 −3
Original line number Diff line number Diff line
@@ -49,9 +49,8 @@ static void hci_cmd_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode, 
	wake_up_interruptible(&hdev->req_wait_q);

}



static struct sk_buff *hci_cmd_sync_alloc(struct hci_dev *hdev, u16 opcode,

					  u32 plen, const void *param,

					  struct sock *sk)

struct sk_buff *hci_cmd_sync_alloc(struct hci_dev *hdev, u16 opcode, u32 plen,

				   const void *param, struct sock *sk)

{

	int len = HCI_COMMAND_HDR_SIZE + plen;

	struct hci_command_hdr *hdr;