aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2013-04-11 12:55:50 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-04-11 15:34:18 -0400
commitbaf4325197c13474b08a18f23706cb7096c89bc6 (patch)
tree193c4ea5c68dd83b145bc46c80d2035ba75fde51 /net/bluetooth
parent92f185c89f2e8f99cfc302994948e962828ccb23 (diff)
Bluetooth: Remove unneeded parameter
This patch removes the status parameter of the l2cap_conn_add function. The parameter 'status' is always 0. Signed-off-by: Claudio Takahasi <claudio.takahasi@openbossa.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 7cdb93c21b32..e09b89be1c4d 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1502,12 +1502,12 @@ static void security_timeout(struct work_struct *work)
1502 } 1502 }
1503} 1503}
1504 1504
1505static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status) 1505static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)
1506{ 1506{
1507 struct l2cap_conn *conn = hcon->l2cap_data; 1507 struct l2cap_conn *conn = hcon->l2cap_data;
1508 struct hci_chan *hchan; 1508 struct hci_chan *hchan;
1509 1509
1510 if (conn || status) 1510 if (conn)
1511 return conn; 1511 return conn;
1512 1512
1513 hchan = hci_chan_create(hcon); 1513 hchan = hci_chan_create(hcon);
@@ -1695,7 +1695,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
1695 goto done; 1695 goto done;
1696 } 1696 }
1697 1697
1698 conn = l2cap_conn_add(hcon, 0); 1698 conn = l2cap_conn_add(hcon);
1699 if (!conn) { 1699 if (!conn) {
1700 hci_conn_drop(hcon); 1700 hci_conn_drop(hcon);
1701 err = -ENOMEM; 1701 err = -ENOMEM;
@@ -6313,7 +6313,7 @@ void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
6313 BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &hcon->dst, status); 6313 BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &hcon->dst, status);
6314 6314
6315 if (!status) { 6315 if (!status) {
6316 conn = l2cap_conn_add(hcon, status); 6316 conn = l2cap_conn_add(hcon);
6317 if (conn) 6317 if (conn)
6318 l2cap_conn_ready(conn); 6318 l2cap_conn_ready(conn);
6319 } else { 6319 } else {
@@ -6482,7 +6482,7 @@ int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)
6482 goto drop; 6482 goto drop;
6483 6483
6484 if (!conn) 6484 if (!conn)
6485 conn = l2cap_conn_add(hcon, 0); 6485 conn = l2cap_conn_add(hcon);
6486 6486
6487 if (!conn) 6487 if (!conn)
6488 goto drop; 6488 goto drop;