Skip to content

Commit

Permalink
Bluetooth: Remove return value from hci_send_frame() function
Browse files Browse the repository at this point in the history
The return value of hci_send_frame() is never checked. So just make
this function void and print an error when the hdev->send driver
callback returns a negative value.

Having the error printed is actually an improvement over the
current situation where any driver error just gets ignored.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  • Loading branch information
Marcel Holtmann authored and Johan Hedberg committed Oct 10, 2013
1 parent 3d386ac commit 5108699
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2697,7 +2697,7 @@ int hci_unregister_cb(struct hci_cb *cb)
}
EXPORT_SYMBOL(hci_unregister_cb);

static int hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
{
BT_DBG("%s type %d len %d", hdev->name, bt_cb(skb)->pkt_type, skb->len);

Expand All @@ -2717,7 +2717,8 @@ static int hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

skb->dev = (void *) hdev;

return hdev->send(skb);
if (hdev->send(skb) < 0)
BT_ERR("%s sending frame failed", hdev->name);
}

void hci_req_init(struct hci_request *req, struct hci_dev *hdev)
Expand Down

0 comments on commit 5108699

Please sign in to comment.