From 0e96213d9e7cb713c31bb2a89288241bb4af8d3f Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 16 Aug 2012 16:15:02 +0300
Subject: [PATCH] --- yaml --- r: 327240 b: refs/heads/master c:
 898132ae76d1aeb52301f10e8795c34fbb54e853 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 59a56506bcf9..fa34768f20db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0625c883bc4b3eba6f93f268cf67b5664244c0fe
+refs/heads/master: 898132ae76d1aeb52301f10e8795c34fbb54e853
diff --git a/trunk/net/ipv6/ip6_flowlabel.c b/trunk/net/ipv6/ip6_flowlabel.c
index c836a6a20a34..90bbefb57943 100644
--- a/trunk/net/ipv6/ip6_flowlabel.c
+++ b/trunk/net/ipv6/ip6_flowlabel.c
@@ -91,12 +91,9 @@ static struct ip6_flowlabel *fl_lookup(struct net *net, __be32 label)
 
 static void fl_free(struct ip6_flowlabel *fl)
 {
-	switch (fl->share) {
-	case IPV6_FL_S_PROCESS:
-		put_pid(fl->owner.pid);
-		break;
-	}
 	if (fl) {
+		if (fl->share == IPV6_FL_S_PROCESS)
+			put_pid(fl->owner.pid);
 		release_net(fl->fl_net);
 		kfree(fl->opt);
 	}