Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baf43251 authored by Claudio Takahasi's avatar Claudio Takahasi Committed by Gustavo Padovan
Browse files

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: default avatarClaudio Takahasi <claudio.takahasi@openbossa.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 92f185c8

net/bluetooth/l2cap_core.c

+5 −5
Original line number Diff line number Diff line
@@ -1502,12 +1502,12 @@ static void security_timeout(struct work_struct *work) 
	}

}



static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status)

static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)

{

	struct l2cap_conn *conn = hcon->l2cap_data;

	struct hci_chan *hchan;



	if (conn || status)

	if (conn)

		return conn;



	hchan = hci_chan_create(hcon);
@@ -1695,7 +1695,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
		goto done;

	}



	conn = l2cap_conn_add(hcon, 0);

	conn = l2cap_conn_add(hcon);

	if (!conn) {

		hci_conn_drop(hcon);

		err = -ENOMEM;
@@ -6313,7 +6313,7 @@ void l2cap_connect_cfm(struct hci_conn *hcon, u8 status) 
	BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &hcon->dst, status);



	if (!status) {

		conn = l2cap_conn_add(hcon, status);

		conn = l2cap_conn_add(hcon);

		if (conn)

			l2cap_conn_ready(conn);

	} else {
@@ -6482,7 +6482,7 @@ int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags) 
		goto drop;



	if (!conn)

		conn = l2cap_conn_add(hcon, 0);

		conn = l2cap_conn_add(hcon);



	if (!conn)

		goto drop;