From: Gustavo Padovan Date: Mon, 21 Oct 2013 16:21:38 +0000 (-0200) Subject: Bluetooth: Do not access chan->sk directly X-Git-Tag: accepted/tizen/common/20141203.182822~719^2~3^2^2~307^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f2c6153746f270cf28559aa81a4da27847bd395;p=platform%2Fkernel%2Flinux-arm64.git 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 Signed-off-by: Marcel Holtmann --- diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 1f326d9..a0b31db 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -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)