From 1b9ff9f2366e1babc5a0659acce23d7fb65726f9 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 25 Nov 2008 16:50:30 -0800
Subject: [PATCH] --- yaml --- r: 122163 b: refs/heads/master c:
 55205d400efe3260e29ad26dd64c992cec2efafd h: refs/heads/master i:   122161:
 863b3e2e05c5c621d4071f5e14cef1cfb102ef4f   122159:
 41c4d7389c6487d5a88449d0a52ee36de7f64bc0 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 6a76558826d1..818fd83a0ceb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc0a0011cfa8ff01b86859006f4db3656c9a896b
+refs/heads/master: 55205d400efe3260e29ad26dd64c992cec2efafd
diff --git a/trunk/net/ipv6/ip6_flowlabel.c b/trunk/net/ipv6/ip6_flowlabel.c
index 7927a8498d17..5656e8aa47d8 100644
--- a/trunk/net/ipv6/ip6_flowlabel.c
+++ b/trunk/net/ipv6/ip6_flowlabel.c
@@ -464,7 +464,7 @@ static inline void fl_link(struct ipv6_pinfo *np, struct ipv6_fl_socklist *sfl,
 
 int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
 {
-	int err;
+	int uninitialized_var(err);
 	struct net *net = sock_net(sk);
 	struct ipv6_pinfo *np = inet6_sk(sk);
 	struct in6_flowlabel_req freq;