diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-12 05:17:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-12 21:00:04 +0200 |
| commit | 3be8fbab18fbc06b6ff94a56f9c225e29ea64a73 (patch) | |
| tree | ad979f12ea175f7f1faa0006a44dd8028a60a349 | |
| parent | be2net: take care of __vlan_put_tag return value (diff) | |
| download | linux-3be8fbab18fbc06b6ff94a56f9c225e29ea64a73.tar.xz linux-3be8fbab18fbc06b6ff94a56f9c225e29ea64a73.zip | |
tuntap: fix error return code in tun_set_iff()
Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.
[ Bug added in linux-3.8 , commit 4008e97f866db665
("tuntap: fix ambigious multiqueue API") ]
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index b7c457adc0dc..729ed533bb33 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1594,7 +1594,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) if (tun->flags & TUN_TAP_MQ && (tun->numqueues + tun->numdisabled > 1)) - return err; + return -EBUSY; } else { char *name; |