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

Commit 13ca56e0 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Johan Hedberg
Browse files

Bluetooth: Make l2cap_data_channel return void 



l2cap_data_channel always return 0 which is not used anywhere,
make it void function.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 3cabbfda

net/bluetooth/l2cap_core.c

+4 −5
Original line number Diff line number Diff line
@@ -5128,7 +5128,8 @@ static int l2cap_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb) 
	return 0;

}



static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk_buff *skb)

static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid,

			       struct sk_buff *skb)

{

	struct l2cap_chan *chan;
@@ -5138,7 +5139,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk 
			chan = a2mp_channel_create(conn, skb);

			if (!chan) {

				kfree_skb(skb);

				return 0;

				return;

			}



			l2cap_chan_lock(chan);
@@ -5146,7 +5147,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk 
			BT_DBG("unknown cid 0x%4.4x", cid);

			/* Drop packet and return */

			kfree_skb(skb);

			return 0;

			return;

		}

	}
@@ -5184,8 +5185,6 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk 


done:

	l2cap_chan_unlock(chan);



	return 0;

}



static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)