diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-10-18 17:56:17 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-10-18 17:56:17 (GMT) |
commit | b231070a18d833f425179f2b51c5b22fb6374c7c (patch) | |
tree | dfdc60810e10a1c0b5e70c1c182f47bac0ca3141 /drivers/bluetooth/hci_ldisc.c | |
parent | b6b561c31d51db3dec0cb55412a5d7a1a2397521 (diff) | |
parent | 4b836f393bd8ed111857a6ee1865e44627266ec6 (diff) | |
download | linux-fsl-qoriq-b231070a18d833f425179f2b51c5b22fb6374c7c.tar.xz |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
-rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index bc68a44..6e06f6f 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -234,21 +234,13 @@ 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) { - BT_ERR("Frame for unknown device (hdev=NULL)"); - return -ENODEV; - } + struct hci_uart *hu = hci_get_drvdata(hdev); if (!test_bit(HCI_RUNNING, &hdev->flags)) return -EBUSY; - hu = hci_get_drvdata(hdev); - BT_DBG("%s: type %d len %d", hdev->name, bt_cb(skb)->pkt_type, skb->len); hu->proto->enqueue(hu, skb); |