| From dfa9fd8ccefdff9960268d2ba27e18d67ac48dfc 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] tun: Fix formatting. |
| |
| commit 8bbb181308bc348e02bfdbebdedd4e4ec9d452ce upstream. |
| |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| drivers/net/tun.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/tun.c b/drivers/net/tun.c |
| index c777d8ebdaa8..bb181e92ad2c 100644 |
| --- a/drivers/net/tun.c |
| +++ b/drivers/net/tun.c |
| @@ -1180,9 +1180,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 |
| -- |
| 1.8.5.2 |
| |
