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 |