Commit ed8ebee6 authored by James Chapman's avatar James Chapman Committed by David S. Miller
Browse files

l2tp: have l2tp_ip_destroy_sock use ip_flush_pending_frames 



Use the recently exported ip_flush_pending_frames instead of a
free-coded version and lock the socket while we call it.

Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
Signed-off-by: default avatarTom Parkin <tparkin@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ff88634

net/l2tp/l2tp_ip.c

+3 −3
Original line number Diff line number Diff line
@@ -236,10 +236,10 @@ static void l2tp_ip_close(struct sock *sk, long timeout) 
static void l2tp_ip_destroy_sock(struct sock *sk)

{

	struct l2tp_tunnel *tunnel;

	struct sk_buff *skb;



	while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL)

		kfree_skb(skb);

	lock_sock(sk);

	ip_flush_pending_frames(sk);

	release_sock(sk);



	tunnel = l2tp_sk_to_tunnel(sk);

	if (tunnel) {