diff --git a/[refs] b/[refs]
index 8a3f877f2eb6..8f5ac81a3768 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6876f95f201ce2d62367d85dd793c1fee351d7a6
+refs/heads/master: 3f1c81ff10187396e6d0fd01df82ab0cec256c96
diff --git a/trunk/net/sched/em_meta.c b/trunk/net/sched/em_meta.c
index 53d98f8d3d80..feefcbfd03d0 100644
--- a/trunk/net/sched/em_meta.c
+++ b/trunk/net/sched/em_meta.c
@@ -250,11 +250,6 @@ META_COLLECTOR(int_tcverd)
 {
 	dst->value = skb->tc_verd;
 }
-
-META_COLLECTOR(int_tcclassid)
-{
-	dst->value = skb->tc_classid;
-}
 #endif
 
 /**************************************************************************
@@ -529,7 +524,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
 		[META_ID(TCINDEX)]		= META_FUNC(int_tcindex),
 #ifdef CONFIG_NET_CLS_ACT
 		[META_ID(TCVERDICT)]		= META_FUNC(int_tcverd),
-		[META_ID(TCCLASSID)]		= META_FUNC(int_tcclassid),
 #endif
 #ifdef CONFIG_NET_CLS_ROUTE
 		[META_ID(RTCLASSID)]		= META_FUNC(int_rtclassid),