summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann2013-10-10 23:54:19 +0200
committerJohan Hedberg2013-10-11 00:19:44 +0200
commit5108699194dfccd8cc324ec6691b2bc810a317ab (patch)
tree473b3923406258283b8ebe6983c4ea180b48e389
parentBluetooth: Remove pointless check of hci_send_frame parameter (diff)
downloadkernel-qcow2-linux-5108699194dfccd8cc324ec6691b2bc810a317ab.tar.gz
kernel-qcow2-linux-5108699194dfccd8cc324ec6691b2bc810a317ab.tar.xz
kernel-qcow2-linux-5108699194dfccd8cc324ec6691b2bc810a317ab.zip
Bluetooth: Remove return value from hci_send_frame() function
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>
-rw-r--r--net/bluetooth/hci_core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 47cf3a95dac0..6cc2f86499f8 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -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);
@@ -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)