summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-05-25 14:01:46 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-05-25 14:01:46 +1000
commitb33a80d65d1e4421830c3272da5153d200d4c82d (patch)
treed719ddaac0f5592f3e5a921bc4b739296480a2ac
parent623c9eab06fba70ee1be2cd82ef56477f70bf86f (diff)
Revert "tun: Update classid on packet injection"
This reverts commit 8286274284e15b11b0f531b6ceeef21fbe00a8dd.
-rw-r--r--drivers/net/tun.c2
-rw-r--r--net/core/sock.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 6ad6fe706312..005cad689578 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -526,8 +526,6 @@ 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/net/core/sock.c b/net/core/sock.c
index 37fe9b6adade..a05ae7f9771e 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1064,7 +1064,6 @@ void sock_update_classid(struct sock *sk)
if (classid && classid != sk->sk_classid)
sk->sk_classid = classid;
}
-EXPORT_SYMBOL(sock_update_classid);
#endif
/**