From: Eric Dumazet Date: Tue, 15 Apr 2014 16:58:34 +0000 (-0400) Subject: ipv4: add a sock pointer to ip_queue_xmit() X-Git-Tag: omap-for-v3.16/pm-signed~106^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0270e91014dabfceaf37f5b40ad51bbf21a1302;p=pandora-kernel.git ipv4: add a sock pointer to ip_queue_xmit() ip_queue_xmit() assumes the skb it has to transmit is attached to an inet socket. Commit 31c70d5956fc ("l2tp: keep original skb ownership") changed l2tp to not change skb ownership and thus broke this assumption. One fix is to add a new 'struct sock *sk' parameter to ip_queue_xmit(), so that we do not assume skb->sk points to the socket used by l2tp tunnel. Fixes: 31c70d5956fc ("l2tp: keep original skb ownership") Reported-by: Zhan Jianyu Tested-by: Zhan Jianyu Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller --- Reading git-diff-tree failed