diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /net/ipv4/tcp_ipv4.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 37ca3843c40b..3dfbc21e555a 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -2388,6 +2388,7 @@ static int __net_init tcp_sk_init(struct net *net) | |||
| 2388 | static void __net_exit tcp_sk_exit(struct net *net) | 2388 | static void __net_exit tcp_sk_exit(struct net *net) |
| 2389 | { | 2389 | { |
| 2390 | inet_ctl_sock_destroy(net->ipv4.tcp_sock); | 2390 | inet_ctl_sock_destroy(net->ipv4.tcp_sock); |
| 2391 | inet_twsk_purge(net, &tcp_hashinfo, &tcp_death_row, AF_INET); | ||
| 2391 | } | 2392 | } |
| 2392 | 2393 | ||
| 2393 | static struct pernet_operations __net_initdata tcp_sk_ops = { | 2394 | static struct pernet_operations __net_initdata tcp_sk_ops = { |