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

Commit 7d5b400c authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Marcel Holtmann
Browse files

Bluetooth: btmrvl: get rid of struct btmrvl_cmd 



Replace this proprietary structure with the standard one
(struct hci_command_hdr).

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent c037874c

drivers/bluetooth/btmrvl_drv.h

+0 −6
Original line number Diff line number Diff line
@@ -116,12 +116,6 @@ struct btmrvl_private { 
#define PS_SLEEP			0x01

#define PS_AWAKE			0x00



struct btmrvl_cmd {

	__le16 ocf_ogf;

	u8 length;

	u8 data[4];

} __packed;



struct btmrvl_event {

	u8 ec;		/* event counter */

	u8 length;

drivers/bluetooth/btmrvl_main.c

+6 −6
Original line number Diff line number Diff line
@@ -170,20 +170,20 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 cmd_no, 
				const void *param, u8 len)

{

	struct sk_buff *skb;

	struct btmrvl_cmd *cmd;

	struct hci_command_hdr *hdr;



	skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);

	skb = bt_skb_alloc(HCI_COMMAND_HDR_SIZE + len, GFP_ATOMIC);

	if (skb == NULL) {

		BT_ERR("No free skb");

		return -ENOMEM;

	}



	cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));

	cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, cmd_no));

	cmd->length = len;

	hdr = (struct hci_command_hdr *)skb_put(skb, HCI_COMMAND_HDR_SIZE);

	hdr->opcode = cpu_to_le16(hci_opcode_pack(OGF, cmd_no));

	hdr->plen = len;



	if (len)

		memcpy(cmd->data, param, len);

		memcpy(skb_put(skb, len), param, len);



	bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;