---

yaml --- r: 320521 b: refs/heads/master c: 8bbb181 h: refs/heads/master i: 320519: 569e933 v: v3
git-mirror · Jul 30, 2012 · 8cdbe70 · 8cdbe70
1 parent 496a0c3
commit 8cdbe70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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