From 8cdbe70b22540631f7b6c869e4d50a220871110c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 30 Jul 2012 14:52:48 -0700
Subject: [PATCH] --- yaml --- r: 320521 b: refs/heads/master c:
 8bbb181308bc348e02bfdbebdedd4e4ec9d452ce h: refs/heads/master i:   320519:
 569e9332be102168f4e969fc247c8fa613316451 v: v3

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

diff --git a/[refs] b/[refs]
index 560af8d56fb9..01ac64ad393b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a117dacde0288f3ec60b6e5bcedae8fa37ee0dfc
+refs/heads/master: 8bbb181308bc348e02bfdbebdedd4e4ec9d452ce
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index f55c46222613..926d4db5cb38 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1382,9 +1382,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 	if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) {
 		if (copy_from_user(&ifr, argp, ifreq_len))
 			return -EFAULT;
-	} else
+	} else {
 		memset(&ifr, 0, sizeof(ifr));
-
+	}
 	if (cmd == TUNGETFEATURES) {
 		/* Currently this just means: "what IFF flags are valid?".
 		 * This is needed because we never checked for invalid flags on