diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-12 03:17:12 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-12 15:00:04 -0400 |
| commit | 3be8fbab18fbc06b6ff94a56f9c225e29ea64a73 (patch) | |
| tree | ad979f12ea175f7f1faa0006a44dd8028a60a349 /drivers/net/tun.c | |
| parent | f11a869d4e38397ac81f2a3d22e8d2aeb3992b0f (diff) | |
| download | op-kernel-dev-3be8fbab18fbc06b6ff94a56f9c225e29ea64a73.zip op-kernel-dev-3be8fbab18fbc06b6ff94a56f9c225e29ea64a73.tar.gz | |
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>
Diffstat (limited to 'drivers/net/tun.c')
| -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 b7c457a..729ed53 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; |
