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

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

Bluetooth: Add hdev parameter to hdev->send driver callback 



Instead of masking hdev inside the skb->dev parameter, hand it
directly to the driver as a parameter to hdev->send. This makes
the driver interface more clear and simpler.

This patch fixes all drivers to accept and handle the new parameter
of hdev->send callback. Special care has been taken for bpa10x
and btusb drivers that require having skb->dev set to hdev for
the URB transmit complete handlers.

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

drivers/bluetooth/bfusb.c

+1 −2
Original line number Diff line number Diff line
@@ -464,9 +464,8 @@ static int bfusb_close(struct hci_dev *hdev) 
	return 0;

}



static int bfusb_send_frame(struct sk_buff *skb)

static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_dev *hdev = (struct hci_dev *) skb->dev;

	struct bfusb_data *data;

	struct sk_buff *nskb;

	unsigned char buf[3];

drivers/bluetooth/bluecard_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -658,10 +658,9 @@ static int bluecard_hci_close(struct hci_dev *hdev) 
}





static int bluecard_hci_send_frame(struct sk_buff *skb)

static int bluecard_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	bluecard_info_t *info;

	struct hci_dev *hdev = (struct hci_dev *)(skb->dev);



	if (!hdev) {

		BT_ERR("Frame for unknown HCI device (hdev=NULL)");

drivers/bluetooth/bpa10x.c

+3 −2
Original line number Diff line number Diff line
@@ -350,9 +350,8 @@ static int bpa10x_flush(struct hci_dev *hdev) 
	return 0;

}



static int bpa10x_send_frame(struct sk_buff *skb)

static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_dev *hdev = (struct hci_dev *) skb->dev;

	struct bpa10x_data *data = hci_get_drvdata(hdev);

	struct usb_ctrlrequest *dr;

	struct urb *urb;
@@ -364,6 +363,8 @@ static int bpa10x_send_frame(struct sk_buff *skb) 
	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	skb->dev = (void *) hdev;



	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urb)

		return -ENOMEM;

drivers/bluetooth/bt3c_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -415,10 +415,9 @@ static int bt3c_hci_close(struct hci_dev *hdev) 
}





static int bt3c_hci_send_frame(struct sk_buff *skb)

static int bt3c_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	bt3c_info_t *info;

	struct hci_dev *hdev = (struct hci_dev *)(skb->dev);

	unsigned long flags;



	if (!hdev) {

drivers/bluetooth/btmrvl_main.c

+1 −3
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 cmd_no, 


	bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;



	skb->dev = (void *) priv->btmrvl_dev.hcidev;

	skb_queue_head(&priv->adapter->tx_queue, skb);



	priv->btmrvl_dev.sendcmdflag = true;
@@ -356,9 +355,8 @@ static void btmrvl_free_adapter(struct btmrvl_private *priv) 
	priv->adapter = NULL;

}



static int btmrvl_send_frame(struct sk_buff *skb)

static int btmrvl_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_dev *hdev = (struct hci_dev *) skb->dev;

	struct btmrvl_private *priv = NULL;



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