From f23c62e8d0cfaf40e85f945eed7eba47cdd2f464 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 3 Jun 2009 21:45:55 -0700
Subject: [PATCH] --- yaml --- r: 150631 b: refs/heads/master c:
 c722c625dbe2758d53365c0ed7d401b0e286f2cf h: refs/heads/master i:   150629:
 bc2a13ce4ceab820775404c18d0233286fd7c9eb   150627:
 b1998ce1969add9081b0fb8612c9be634e144bc6   150623:
 e0f030801a006a5bf88a9284450c0b161ec33f5b v: v3

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

diff --git a/[refs] b/[refs]
index 225cfe325ff3..0845dde84b95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8c617eae4dc2ea9f3d64472233f2d3dc3c9993c
+refs/heads/master: c722c625dbe2758d53365c0ed7d401b0e286f2cf
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 4cda69b6b28c..3f0cdc14be82 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -844,12 +844,12 @@ static void tun_sock_write_space(struct sock *sk)
 	if (!sock_writeable(sk))
 		return;
 
-	if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
-		wake_up_interruptible_sync(sk->sk_sleep);
-
 	if (!test_and_clear_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags))
 		return;
 
+	if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
+		wake_up_interruptible_sync(sk->sk_sleep);
+
 	tun = container_of(sk, struct tun_sock, sk)->tun;
 	kill_fasync(&tun->fasync, SIGIO, POLL_OUT);
 }