From 505438e1ff894b17288dae9766458d19850bcf10 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Wed, 12 Sep 2012 16:12:01 +0200
Subject: [PATCH] --- yaml --- r: 327206 b: refs/heads/master c:
 f3419807716be503c06f399b2bcbc68823be3a78 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/tun.c        | 1 +
 trunk/include/net/cls_cgroup.h | 6 ++++++
 trunk/include/net/sock.h       | 8 --------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e2c86e5baa31..23bdc7e646c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83b061fc09489fb1b827f65cdca014c37ed224bb
+refs/heads/master: f3419807716be503c06f399b2bcbc68823be3a78
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 3a16d4fdaa05..9336b829cc81 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -68,6 +68,7 @@
 #include <net/netns/generic.h>
 #include <net/rtnetlink.h>
 #include <net/sock.h>
+#include <net/cls_cgroup.h>
 
 #include <asm/uaccess.h>
 
diff --git a/trunk/include/net/cls_cgroup.h b/trunk/include/net/cls_cgroup.h
index a4dc5b027bd9..e88527a68454 100644
--- a/trunk/include/net/cls_cgroup.h
+++ b/trunk/include/net/cls_cgroup.h
@@ -24,6 +24,8 @@ struct cgroup_cls_state
 	u32 classid;
 };
 
+extern void sock_update_classid(struct sock *sk);
+
 #ifdef CONFIG_NET_CLS_CGROUP
 static inline u32 task_cls_classid(struct task_struct *p)
 {
@@ -62,6 +64,10 @@ static inline u32 task_cls_classid(struct task_struct *p)
 }
 #endif
 #else
+static inline void sock_update_classid(struct sock *sk)
+{
+}
+
 static inline u32 task_cls_classid(struct task_struct *p)
 {
 	return 0;
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 72132aef53fc..160a68093dbc 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -1486,14 +1486,6 @@ extern void *sock_kmalloc(struct sock *sk, int size,
 extern void sock_kfree_s(struct sock *sk, void *mem, int size);
 extern void sk_send_sigurg(struct sock *sk);
 
-#ifdef CONFIG_CGROUPS
-extern void sock_update_classid(struct sock *sk);
-#else
-static inline void sock_update_classid(struct sock *sk)
-{
-}
-#endif
-
 /*
  * Functions to fill in entries in struct proto_ops when a protocol
  * does not implement a particular function.