---

yaml --- r: 351991 b: refs/heads/master c: 243bb4c h: refs/heads/master i: 351989: 2ccdfd1 351987: b2ec0b8 351983: 0832a97 v: v3
git-mirror · Jan 29, 2013 · 32c8afc · 32c8afc
1 parent 0a86f02
commit 32c8afc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e58a0275015e5c8988bda9cd0635e2ef405c985
+refs/heads/master: 243bb4c6d731f886ac7a99b986e46625f0d5ba07
diff --git a/trunk/net/ipv6/inet6_connection_sock.c b/trunk/net/ipv6/inet6_connection_sock.c
@@ -34,7 +34,7 @@ int inet6_csk_bind_conflict(const struct sock *sk,
 	const struct hlist_node *node;
 	int reuse = sk->sk_reuse;
 	int reuseport = sk->sk_reuseport;
-	int uid = sock_i_uid((struct sock *)sk);
+	kuid_t uid = sock_i_uid((struct sock *)sk);
 
 	/* We must walk the whole port owner list in this case. -DaveM */
 	/*