From ba854556b82412acd7ed1bf5552019620d6e5c0d Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Thu, 9 Aug 2012 02:50:40 +0000
Subject: [PATCH] --- yaml --- r: 321584 b: refs/heads/master c:
 66d1b9263a371abd15806c53f486f0645ef31a8f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4d34e0ecf598..94f649ba14cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2d6a1d5a435b051d3660961d5dee5b33b15f754
+refs/heads/master: 66d1b9263a371abd15806c53f486f0645ef31a8f
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 926d4db5cb38..3a16d4fdaa05 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -187,7 +187,6 @@ static void __tun_detach(struct tun_struct *tun)
 	netif_tx_lock_bh(tun->dev);
 	netif_carrier_off(tun->dev);
 	tun->tfile = NULL;
-	tun->socket.file = NULL;
 	netif_tx_unlock_bh(tun->dev);
 
 	/* Drop read queue */