From 32c8afce41eeb71e2800dd53f592b722d4465b02 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 29 Jan 2013 02:16:18 +0000 Subject: [PATCH] --- yaml --- r: 351991 b: refs/heads/master c: 243bb4c6d731f886ac7a99b986e46625f0d5ba07 h: refs/heads/master i: 351989: 2ccdfd1fa09ceafbccc2eafd579cd75e67b53b5e 351987: b2ec0b8d6e3066ae09c897e8a2de2cef0e6bbd53 351983: 0832a97ee53bd79afa0f93ab06cb6e02816899d7 v: v3 --- [refs] | 2 +- trunk/net/ipv6/inet6_connection_sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fba186b2b919..79d145162741 100644 --- 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 index e4297a393678..b386a2ce4c6f 100644 --- 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 */ /*