lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:

	net/mac80211/mlme.c
This commit is contained in:
David S. Miller
2008-09-08 16:59:05 -07:00
parent 712d6954e3 82a28c794f
commit 17dce5dfe3
1036 changed files with 34407 additions and 11129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/ipv4/tcp_ipv4.c
View File

@@ -2388,6 +2388,7 @@ static int __net_init tcp_sk_init(struct net *net)
static void __net_exit tcp_sk_exit(struct net *net)
{
inet_ctl_sock_destroy(net->ipv4.tcp_sock);
inet_twsk_purge(net, &tcp_hashinfo, &tcp_death_row, AF_INET);
}
static struct pernet_operations __net_initdata tcp_sk_ops = {