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

Commit cbe8fed4 authored Jan 08, 2012 by Johan Hedberg

Bluetooth: Remove bogus inline declaration from l2cap_chan_connect



As reported by Dan Carpenter this function causes a Sparse warning and
shouldn't be declared inline:

include/net/bluetooth/l2cap.h:837:30 error: marked inline, but without a
definition"

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

parent dc946bd8

include/net/bluetooth/l2cap.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -834,7 +834,7 @@ int l2cap_add_scid(struct l2cap_chan *chan, __u16 scid);
		struct l2cap_chan l2cap_chan_create(struct sock sk);
		void l2cap_chan_close(struct l2cap_chan *chan, int reason);
		void l2cap_chan_destroy(struct l2cap_chan *chan);
		inline int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
		int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
		bdaddr_t *dst);
		int l2cap_chan_send(struct l2cap_chan chan, struct msghdr msg, size_t len,
		u32 priority);

net/bluetooth/l2cap_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1120,7 +1120,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, bdaddr
		return c1;
		}

		inline int l2cap_chan_connect(struct l2cap_chan chan, __le16 psm, u16 cid, bdaddr_t dst)
		int l2cap_chan_connect(struct l2cap_chan chan, __le16 psm, u16 cid, bdaddr_t dst)
		{
		struct sock *sk = chan->sk;
		bdaddr_t *src = &bt_sk(sk)->src;