l2tp: use skb_queue_purge in l2tp_ip_destroy_sock
authorJames Chapman <jchapman@katalix.com>
Mon, 19 Aug 2024 14:33:33 +0000 (15:33 +0100)
committerJakub Kicinski <kuba@kernel.org>
Tue, 20 Aug 2024 23:52:28 +0000 (16:52 -0700)
commitbc3dd9ed04d69cba3bb603da06fa26d888233cff
tree9df1c1cf93fce3d2bbbabee9f33cf222520f3db2
parent8594d9b85c07f05e431bd07e895c2a3ad9b85d6f
l2tp: use skb_queue_purge in l2tp_ip_destroy_sock

Recent commit ed8ebee6def7 ("l2tp: have l2tp_ip_destroy_sock use
ip_flush_pending_frames") was incorrect in that l2tp_ip does not use
socket cork and ip_flush_pending_frames is for sockets that do. Use
__skb_queue_purge instead and remove the unnecessary lock.

Also unexport ip_flush_pending_frames since it was originally exported
in commit 4ff8863419cd ("ipv4: export ip_flush_pending_frames") for
l2tp and is not used by other modules.

Suggested-by: xiyou.wangcong@gmail.com
Signed-off-by: James Chapman <jchapman@katalix.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20240819143333.3204957-1-jchapman@katalix.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/ip_output.c
net/l2tp/l2tp_ip.c