From ede1537c568870590025b091de266da6a3769698 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 14 Nov 2008 10:39:07 +1100
Subject: [PATCH] --- yaml --- r: 120705 b: refs/heads/master c:
 f82b359023c8b7b343edef6c63322b900d9e74a1 h: refs/heads/master i:   120703:
 ece08ef645c32cfe52da80c0f670e5b9ea5fd29a v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv6/ip6_flowlabel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 86ed27e499bf..b615be6b33f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 734004072e05ae81c3cdd0a04ee37868fb09b71e
+refs/heads/master: f82b359023c8b7b343edef6c63322b900d9e74a1
diff --git a/trunk/net/ipv6/ip6_flowlabel.c b/trunk/net/ipv6/ip6_flowlabel.c
index 37a4e777e347..bd3c7b96bbaa 100644
--- a/trunk/net/ipv6/ip6_flowlabel.c
+++ b/trunk/net/ipv6/ip6_flowlabel.c
@@ -388,7 +388,7 @@ fl_create(struct net *net, struct in6_flowlabel_req *freq, char __user *optval,
 		fl->owner = current->pid;
 		break;
 	case IPV6_FL_S_USER:
-		fl->owner = current->euid;
+		fl->owner = current_euid();
 		break;
 	default:
 		err = -EINVAL;