From aa396470ab445f0550782e498601e2a0109d7a5c Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Mon, 20 Aug 2012 07:59:10 +0000
Subject: [PATCH] --- yaml --- r: 327614 b: refs/heads/master c:
 3afa6d00fb4f9712fbb44b63ba31f88b6f9239fe h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6f9e028b82c6..dd1720ee7da5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6e94e392fddb8845bdd2e199f55ebf7d76cb58d
+refs/heads/master: 3afa6d00fb4f9712fbb44b63ba31f88b6f9239fe
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 8f67ced8d6a8..116786c55fe9 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -1230,7 +1230,7 @@ void sock_update_classid(struct sock *sk)
 	rcu_read_lock();  /* doing current task, which cannot vanish. */
 	classid = task_cls_classid(current);
 	rcu_read_unlock();
-	if (classid && classid != sk->sk_classid)
+	if (classid != sk->sk_classid)
 		sk->sk_classid = classid;
 }
 EXPORT_SYMBOL(sock_update_classid);