Bluetooth: Add hdev parameter to hdev->send driver callback
Subsystems (2)
Marcel Holtmann
maintainerPATCH 1/1 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.
--- drivers/bluetooth/bfusb.c | 3 +-- drivers/bluetooth/bluecard_cs.c | 3 +-- drivers/bluetooth/bpa10x.c | 5 +++-- drivers/bluetooth/bt3c_cs.c | 3 +-- drivers/bluetooth/btmrvl_main.c | 4 +--- drivers/bluetooth/btsdio.c | 3 +-- drivers/bluetooth/btuart_cs.c | 3 +-- drivers/bluetooth/btusb.c | 5 +++-- drivers/bluetooth/btwilink.c | 5 +---- drivers/bluetooth/dtl1_cs.c | 3 +-- drivers/bluetooth/hci_ldisc.c | 3 +-- drivers/bluetooth/hci_ll.c | 1 - drivers/bluetooth/hci_vhci.c | 3 +-- include/net/bluetooth/hci_core.h | 2 +- net/bluetooth/hci_core.c | 4 +--- 15 files changed, 18 insertions(+), 32 deletions(-)
drivers/bluetooth/bfusb.c +1 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
drivers/bluetooth/btsdio.c +1 -2
@@ -254,9 +254,8 @@ static int btsdio_flush(struct hci_dev *hdev)return 0 ; } -static int btsdio_send_frame (struct sk_buff *skb) +static int btsdio_send_frame (struct hci_dev *hdev,struct sk_buff *skb) { -struct hci_dev *hdev = (struct hci_dev *) skb->dev;struct btsdio_data *data =hci_get_drvdata (hdev);BT_DBG ("%s" , hdev->name);
drivers/bluetooth/btuart_cs.c +1 -2
@@ -423,10 +423,9 @@ static int btuart_hci_close(struct hci_dev *hdev) } -static int btuart_hci_send_frame (struct sk_buff *skb) +static int btuart_hci_send_frame (struct hci_dev *hdev,struct sk_buff *skb) {btuart_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/btusb.c +3 -2
@@ -716,9 +716,8 @@ static int btusb_flush(struct hci_dev *hdev)return 0 ; } -static int btusb_send_frame (struct sk_buff *skb) +static int btusb_send_frame (struct hci_dev *hdev,struct sk_buff *skb) { -struct hci_dev *hdev = (struct hci_dev *) skb->dev;struct btusb_data *data =hci_get_drvdata (hdev);struct usb_ctrlrequest *dr;struct urb *urb;
@@ -730,6 +729,8 @@ static int btusb_send_frame(struct sk_buff *skb)if (!test_bit (HCI_RUNNING , &hdev->flags))return -EBUSY ; + skb->dev = (void *) hdev; +switch (bt_cb (skb)->pkt_type) {case HCI_COMMAND_PKT : urb =usb_alloc_urb (0 ,GFP_ATOMIC );
drivers/bluetooth/btwilink.c +1 -4
@@ -251,14 +251,11 @@ static int ti_st_close(struct hci_dev *hdev)return err; } -static int ti_st_send_frame (struct sk_buff *skb) +static int ti_st_send_frame (struct hci_dev *hdev,struct sk_buff *skb) { -struct hci_dev *hdev;struct ti_st *hst;long len; - hdev = (struct hci_dev *)skb->dev; -if (!test_bit (HCI_RUNNING , &hdev->flags))return -EBUSY ;
drivers/bluetooth/dtl1_cs.c +1 -2
@@ -382,10 +382,9 @@ static int dtl1_hci_close(struct hci_dev *hdev) } -static int dtl1_hci_send_frame (struct sk_buff *skb) +static int dtl1_hci_send_frame (struct hci_dev *hdev,struct sk_buff *skb) {dtl1_info_t *info; -struct hci_dev *hdev = (struct hci_dev *)(skb->dev);struct sk_buff *s;nsh_t nsh;
drivers/bluetooth/hci_ldisc.c +1 -2
@@ -234,9 +234,8 @@ static int hci_uart_close(struct hci_dev *hdev) }/* Send frames from HCI layer */ -static int hci_uart_send_frame (struct sk_buff *skb) +static int hci_uart_send_frame (struct hci_dev *hdev,struct sk_buff *skb) { -struct hci_dev * hdev = (struct hci_dev *) skb->dev;struct hci_uart *hu;if (!hdev) {
drivers/bluetooth/hci_ll.c +0 -1
@@ -110,7 +110,6 @@ static int send_hcill_cmd(u8 cmd, struct hci_uart *hu)/* prepare packet */ hcill_packet = (struct hcill_cmd *)skb_put (skb,1 ); hcill_packet->cmd = cmd; - skb->dev = (void *) hu->hdev;/* send packet */ skb_queue_tail (&ll->txq, skb);
drivers/bluetooth/hci_vhci.c +1 -2
@@ -81,9 +81,8 @@ static int vhci_flush(struct hci_dev *hdev)return 0 ; } -static int vhci_send_frame (struct sk_buff *skb) +static int vhci_send_frame (struct hci_dev *hdev,struct sk_buff *skb) { -struct hci_dev * hdev = (struct hci_dev *) skb->dev;struct vhci_data *data;if (!hdev) {
include/net/bluetooth/hci_core.h +1 -1
@@ -285,7 +285,7 @@ struct hci_dev {int (*close)(struct hci_dev *hdev);int (*flush)(struct hci_dev *hdev);int (*setup)(struct hci_dev *hdev); -int (*send)(struct sk_buff *skb); +int (*send)(struct hci_dev *hdev,struct sk_buff *skb);void (*notify)(struct hci_dev *hdev,unsigned int evt); };
net/bluetooth/hci_core.c +1 -3
@@ -2713,9 +2713,7 @@ static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)/* Get rid of skb owner, prior to sending to the driver. */ skb_orphan (skb); - skb->dev = (void *) hdev; - -if (hdev->send (skb) <0 ) +if (hdev->send (hdev, skb) <0 )BT_ERR ("%s sending frame failed" , hdev->name); }
Signature · 1 line
1.8.3.1
Johan Hedberg
AppliedHi Marcel,
Quoted 19 lines · Marcel Holtmann
Instead of masking hdev inside the
skb->devparameter, hand it directly to the driver as a parameter tohdev->send. This makes the driver interface more clear and simpler.This patch fixes all drivers to accept and handle the new parameter of
hdev->sendcallback. Special care has been taken for bpa10x and btusb drivers that require havingskb->devset to hdev for the URB transmit complete handlers.Signed-off-by Marcel Holtmann <[email protected]>--- drivers/bluetooth/bfusb.c | 3 +-- drivers/bluetooth/bluecard_cs.c | 3 +-- drivers/bluetooth/bpa10x.c | 5 +++-- drivers/bluetooth/bt3c_cs.c | 3 +-- drivers/bluetooth/btmrvl_main.c | 4 +--- drivers/bluetooth/btsdio.c | 3 +-- drivers/bluetooth/btuart_cs.c | 3 +-- drivers/bluetooth/btusb.c | 5 +++--
Quoted 8 lines
drivers/bluetooth/btwilink.c | 5 +---- drivers/bluetooth/dtl1_cs.c | 3 +-- drivers/bluetooth/hci_ldisc.c | 3 +-- drivers/bluetooth/hci_ll.c | 1 - drivers/bluetooth/hci_vhci.c | 3 +-- include/net/bluetooth/hci_core.h | 2 +- net/bluetooth/hci_core.c | 4 +--- 15 files changed, 18 insertions(+), 32 deletions(-)
Applied to bluetooth-next. Thanks.
Johan