From 761d86906cef5b6c77a1f0dfe194fee913652a98 Mon Sep 17 00:00:00 2001
From: Paul Moore <pmoore@redhat.com>
Date: Thu, 6 Dec 2012 05:48:38 +0000
Subject: [PATCH] --- yaml --- r: 341915 b: refs/heads/master c:
 b3943aef7ecfcc47609136f46773e9a839c950b0 h: refs/heads/master i:   341913:
 8b86eb31ab1f94f5a5e1e14c5fc7370b499c8c8e   341911:
 79e380849c07648f383bf0251a508170982e8e07 v: v3

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

diff --git a/[refs] b/[refs]
index 5986c7a6f625..8f1561bf549d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6d048641a979d56730c28411df88d0f55184f24
+refs/heads/master: b3943aef7ecfcc47609136f46773e9a839c950b0
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index a1b2389e6d7f..14a04543cd91 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1591,7 +1591,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 
 		tun_net_init(dev);
 
-		if (tun_flow_init(tun))
+		err = tun_flow_init(tun);
+		if (err < 0)
 			goto err_free_dev;
 
 		dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST |