diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-08 15:43:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-08 15:43:44 -0700 |
commit | bcbc713470283bc82d043fd23b02e41a9eb8dee5 (patch) | |
tree | 2cd88a1b83dad55dc9e489f151114c0717015ac5 /net/ipv6/tcp_ipv6.c | |
parent | b364e2f5262e972e731a576dfc6ede0689a6c19e (diff) | |
parent | 8d4698f7a54a492a1b96c505b30fe750ae3e61d5 (diff) | |
download | kernel_samsung_smdk4412-bcbc713470283bc82d043fd23b02e41a9eb8dee5.zip kernel_samsung_smdk4412-bcbc713470283bc82d043fd23b02e41a9eb8dee5.tar.gz kernel_samsung_smdk4412-bcbc713470283bc82d043fd23b02e41a9eb8dee5.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
bridge: don't allow setting hello time to zero
netns : fix kernel panic in timewait socket destruction
pkt_sched: Fix qdisc state in net_tx_action()
netfilter: nf_conntrack_irc: make sure string is terminated before calling simple_strtoul
netfilter: nf_conntrack_gre: nf_ct_gre_keymap_flush() fixlet
netfilter: nf_conntrack_gre: more locking around keymap list
netfilter: nf_conntrack_sip: de-static helper pointers
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 5b90b36..b585c85 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -2148,6 +2148,7 @@ static int tcpv6_net_init(struct net *net) static void tcpv6_net_exit(struct net *net) { inet_ctl_sock_destroy(net->ipv6.tcp_sk); + inet_twsk_purge(net, &tcp_hashinfo, &tcp_death_row, AF_INET6); } static struct pernet_operations tcpv6_net_ops = { |