Skip to content

Commit

Permalink
Bluetooth: Fix error return on L2CAP-HCI interface.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
João Paulo Rechi Vita authored and Marcel Holtmann committed Jul 21, 2010
1 parent 7a560e5 commit 963cf68
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/bluetooth/l2cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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));

Expand Down

0 comments on commit 963cf68

Please sign in to comment.