Bluetooth: Fix error return on L2CAP-HCI interface.
authorJoão Paulo Rechi Vita <jprvita@profusion.mobi>
Tue, 22 Jun 2010 16:56:28 +0000 (13:56 -0300)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 21 Jul 2010 17:39:10 +0000 (10:39 -0700)
L2CAP only deals with ACL links. EINVAL should be returned otherwise.

Signed-off-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/l2cap.c

index de545f1687d8fd8153d682bc65008826096501a1..a3dfee97ab9da6eed967077cce36c6a93b6343f6 100644 (file)
@@ -4415,7 +4415,7 @@ static int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)
        struct hlist_node *node;
 
        if (type != ACL_LINK)
-               return 0;
+               return -EINVAL;
 
        BT_DBG("hdev %s, bdaddr %s", hdev->name, batostr(bdaddr));
 
@@ -4448,7 +4448,7 @@ static int l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
        BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status);
 
        if (hcon->type != ACL_LINK)
-               return 0;
+               return -EINVAL;
 
        if (!status) {
                conn = l2cap_conn_add(hcon, status);
@@ -4477,7 +4477,7 @@ static int l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)
        BT_DBG("hcon %p reason %d", hcon, reason);
 
        if (hcon->type != ACL_LINK)
-               return 0;
+               return -EINVAL;
 
        l2cap_conn_del(hcon, bt_err(reason));