diff options
author | Tony Lindgren <tony@atomide.com> | 2013-04-01 08:55:04 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-04-01 08:55:04 -0700 |
commit | d29778a01d5fc4b69ca1e7bc21121536e5c1c31d (patch) | |
tree | 0fb90068b5b19436723d55bc44350776588c2992 /net/l2tp/l2tp_ip6.c | |
parent | ce9df0b00ac7f0a733d361c23bebdd79f32f8adc (diff) | |
parent | 469d633d20c774ecd34ac615c838193e1e150c62 (diff) | |
download | talos-op-linux-d29778a01d5fc4b69ca1e7bc21121536e5c1c31d.tar.gz talos-op-linux-d29778a01d5fc4b69ca1e7bc21121536e5c1c31d.zip |
Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.10/fixes-non-critical
Some miscellaneous OMAP hwmod, powerdomain, and clock fixes for 3.10.
Basic test logs are here:
http://www.pwsan.com/omap/testlogs/prcm_fixes_a_3.10/20130331205716/
Diffstat (limited to 'net/l2tp/l2tp_ip6.c')
-rw-r--r-- | net/l2tp/l2tp_ip6.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index 41f2f8126ebc..c74f5a91ff6a 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -241,10 +241,17 @@ static void l2tp_ip6_close(struct sock *sk, long timeout) static void l2tp_ip6_destroy_sock(struct sock *sk) { + struct l2tp_tunnel *tunnel = l2tp_sock_to_tunnel(sk); + lock_sock(sk); ip6_flush_pending_frames(sk); release_sock(sk); + if (tunnel) { + l2tp_tunnel_closeall(tunnel); + sock_put(sk); + } + inet6_destroy_sock(sk); } |