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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	net/ipv4/inet_diag.c
This commit is contained in:
David S. Miller
2011-11-26 14:47:03 -05:00
parent d6f03f29f7 fc0b927d9a
commit 6dec4ac4ee
42 changed files with 162 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/inet6_connection_sock.c
View File

@@ -85,7 +85,7 @@ struct dst_entry *inet6_csk_route_req(struct sock *sk,
* request_sock (formerly open request) hash tables.
*/
static u32 inet6_synq_hash(const struct in6_addr *raddr, const __be16 rport,
const u32 rnd, const u16 synq_hsize)
const u32 rnd, const u32 synq_hsize)
{
u32 c;