forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	arch/microblaze/include/asm/socket.h
This commit is contained in:
David S. Miller 2009-08-12 17:44:53 -07:00
commit aa11d958d1
1599 changed files with 38227 additions and 25978 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/sctp/protocol.c
View file

@ -160,6 +160,7 @@ static void sctp_proc_exit(void)
remove_proc_entry("sctp", init_net.proc_net);
}
#endif
percpu_counter_destroy(&sctp_sockets_allocated);
}
/* Private helper to extract ipv4 address and stash them in