mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 07:12:09 +00:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: net/mac80211/mlme.c
This commit is contained in:
commit
17dce5dfe3
1036 changed files with 34407 additions and 11129 deletions
|
@ -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 = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue