From aea99fabfe7edf0fd6ba8f084c7093c39dcda820 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 24 May 2010 00:14:10 -0700
Subject: [PATCH] --- yaml --- r: 198592 b: refs/heads/master c:
 8286274284e15b11b0f531b6ceeef21fbe00a8dd h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 2 ++
 trunk/net/core/sock.c   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 60d09f87bdd8..0c1d999df7af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f845172531fb7410c7fb7780b1a6e51ee6df7d52
+refs/heads/master: 8286274284e15b11b0f531b6ceeef21fbe00a8dd
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 97b25533e5fb..8793c2bf7f15 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -526,6 +526,8 @@ static inline struct sk_buff *tun_alloc_skb(struct tun_struct *tun,
 	struct sk_buff *skb;
 	int err;
 
+	sock_update_classid(sk);
+
 	/* Under a page?  Don't bother with paged skb. */
 	if (prepad + len < PAGE_SIZE || !linear)
 		linear = len;
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index a05ae7f9771e..37fe9b6adade 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -1064,6 +1064,7 @@ void sock_update_classid(struct sock *sk)
 	if (classid && classid != sk->sk_classid)
 		sk->sk_classid = classid;
 }
+EXPORT_SYMBOL(sock_update_classid);
 #endif
 
 /**