Commit 0f2c6153 authored Oct 21, 2013 by Gustavo Padovan Committed by Marcel Holtmann Oct 21, 2013

Bluetooth: Do not access chan->sk directly

In the process of removing socket usage from L2CAP we now access the L2CAP
socket from the data member of struct l2cap_chan. For the L2CAP socket
user the data member points to the L2CAP socket.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent d42970f3

net/bluetooth/l2cap_sock.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1159,11 +1159,12 @@ static void l2cap_sock_state_change_cb(struct l2cap_chan *chan, int state,
		static struct sk_buff l2cap_sock_alloc_skb_cb(struct l2cap_chan chan,
		unsigned long len, int nb)
		{
		struct sock *sk = chan->data;
		struct sk_buff *skb;
		int err;

		l2cap_chan_unlock(chan);
		skb = bt_skb_send_alloc(chan->sk, len, nb, &err);
		skb = bt_skb_send_alloc(sk, len, nb, &err);
		l2cap_chan_lock(chan);

		if (!skb)