tuntap: correct the return value in tun_set_iff()
Subsystems (3)
PATCH 1/1 tuntap: correct the return value in tun_set_iff()
commit (3be8fbab tuntap: fix error return code in tun_set_iff()) breaks the creation of multiqueue tuntap since it forbids to create more than one queues for a multiqueue tuntap device. We need return 0 instead -EBUSY here since we don't want to re-initialize the device when one or more queues has been already attached. Add a comment and correct the return value to zero.
--- drivers/net/tun.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/net/tun.c +4 -1
@@ -1594,7 +1594,10 @@ 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 -EBUSY ; +/* One or more queue has already been attached, no need +* to initialize the device again. +*/ +return 0 ; }else {char *name;
Signature · 1 line
1.7.1
Quoted 32 lines · Jason Wang
commit (
3be8fbabtuntap: fix error return code intun_set_iff()) breaks the creation of multiqueue tuntap since it forbids to create more than one queues for a multiqueue tuntap device. We need return 0 instead-EBUSYhere since we don't want to re-initialize the device when one or more queues has been already attached. Add a comment and correct the return value to zero.Reported-by Jerry Chu <[email protected]>Cc Jerry Chu <[email protected]>Cc Wei Yongjun <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>--- drivers/net/tun.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)drivers/net/tun.c +4
-2@@ -1594,7 +1594,10 @@ 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 -EBUSY ; +/* One or more queue has already been attached, no need +* to initialize the device again. +*/ +return 0 ; }else {char *name; --
Quoted 2 lines
1.7.1
Quoted 11 lines · Jason Wang
commit (
3be8fbabtuntap: fix error return code intun_set_iff()) breaks the creation of multiqueue tuntap since it forbids to create more than one queues for a multiqueue tuntap device. We need return 0 instead-EBUSYhere since we don't want to re-initialize the device when one or more queues has been already attached. Add a comment and correct the return value to zero.Reported-by Jerry Chu <[email protected]>Cc Jerry Chu <[email protected]>Cc Wei Yongjun <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>
Quoted 27 lines
--- drivers/net/tun.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)drivers/net/tun.c +4
-1@@ -1594,7 +1594,10 @@ 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 -EBUSY ; +/* One or more queue has already been attached, no need +* to initialize the device again. +*/ +return 0 ; }else {char *name;Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jason Wang <[email protected]>
Date: Tue, 23 Apr 2013 14:40:39 +0800
Quoted 11 lines
commit (
3be8fbabtuntap: fix error return code intun_set_iff()) breaks the creation of multiqueue tuntap since it forbids to create more than one queues for a multiqueue tuntap device. We need return 0 instead-EBUSYhere since we don't want to re-initialize the device when one or more queues has been already attached. Add a comment and correct the return value to zero.Reported-by Jerry Chu <[email protected]>Cc Jerry Chu <[email protected]>Cc Wei Yongjun <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>
Applied.