From 3b83753b53d69809473d390decdbdfd82f4a2eba Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 13 Mar 2013 03:03:58 +0000
Subject: [PATCH] --- yaml --- r: 368247 b: refs/heads/master c:
 f7de0b936811296f7d88d378af80ad14b061769a h: refs/heads/master i:   368245:
 fb1976de5338c1dca46c221143d9dfa18bc7316a   368243:
 eccd3f9bc2aa9d6a98514989abd20b39dfeffe40   368239:
 019362b693bde52f8678c16cf1e1853f7be581c1 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 01966142930e..7c4fc224af0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df594563fc8503d8473341fc67fc890c65c3a7c9
+refs/heads/master: f7de0b936811296f7d88d378af80ad14b061769a
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index b7c457adc0dc..95837c1b197a 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -409,14 +409,12 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
 {
 	struct tun_file *ntfile;
 	struct tun_struct *tun;
-	struct net_device *dev;
 
 	tun = rtnl_dereference(tfile->tun);
 
 	if (tun && !tfile->detached) {
 		u16 index = tfile->queue_index;
 		BUG_ON(index >= tun->numqueues);
-		dev = tun->dev;
 
 		rcu_assign_pointer(tun->tfiles[index],
 				   tun->tfiles[tun->numqueues - 1]);