On Mon, Apr 22, 2013 at 11:40 PM, Jason Wang <[email protected]> wrote: > 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. > > 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(-) > > diff --git a/drivers/net/tun.c b/drivers/net/tun.c > index 729ed53..3a8977e 100644 > --- a/drivers/net/tun.c > +++ b/drivers/net/tun.c > @@ -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; > -- > 1.7.1 >
Acked-by: Jerry Chu <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
