* [PATCH net] tuntap: restore default qdisc
@ 2016-04-08 5:26 Jason Wang
2016-04-08 7:47 ` Michael S. Tsirkin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jason Wang @ 2016-04-08 5:26 UTC (permalink / raw)
To: davem, netdev, linux-kernel; +Cc: mst, Jason Wang, Phil Sutter
After commit f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using
alloc_netdev"), default qdisc was changed to noqueue because
tuntap does not set tx_queue_len during .setup(). This patch restores
default qdisc by setting tx_queue_len in tun_setup().
Fixes: f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using alloc_netdev")
Cc: Phil Sutter <phil@nwl.cc>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/tun.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 510e90a..2c9e45f5 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1015,7 +1015,6 @@ static void tun_net_init(struct net_device *dev)
/* Zero header length */
dev->type = ARPHRD_NONE;
dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
- dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */
break;
case IFF_TAP:
@@ -1027,7 +1026,6 @@ static void tun_net_init(struct net_device *dev)
eth_hw_addr_random(dev);
- dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */
break;
}
}
@@ -1481,6 +1479,8 @@ static void tun_setup(struct net_device *dev)
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
+ /* We prefer our own queue length */
+ dev->tx_queue_len = TUN_READQ_SIZE;
}
/* Trivial set of netlink ops to allow deleting tun or tap
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net] tuntap: restore default qdisc
2016-04-08 5:26 [PATCH net] tuntap: restore default qdisc Jason Wang
@ 2016-04-08 7:47 ` Michael S. Tsirkin
2016-04-08 9:02 ` Phil Sutter
2016-04-08 19:53 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Michael S. Tsirkin @ 2016-04-08 7:47 UTC (permalink / raw)
To: Jason Wang; +Cc: davem, netdev, linux-kernel, Phil Sutter
On Fri, Apr 08, 2016 at 01:26:48PM +0800, Jason Wang wrote:
> After commit f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using
> alloc_netdev"), default qdisc was changed to noqueue because
> tuntap does not set tx_queue_len during .setup(). This patch restores
> default qdisc by setting tx_queue_len in tun_setup().
>
> Fixes: f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using alloc_netdev")
> Cc: Phil Sutter <phil@nwl.cc>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/net/tun.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index 510e90a..2c9e45f5 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -1015,7 +1015,6 @@ static void tun_net_init(struct net_device *dev)
> /* Zero header length */
> dev->type = ARPHRD_NONE;
> dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
> - dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */
> break;
>
> case IFF_TAP:
> @@ -1027,7 +1026,6 @@ static void tun_net_init(struct net_device *dev)
>
> eth_hw_addr_random(dev);
>
> - dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */
> break;
> }
> }
> @@ -1481,6 +1479,8 @@ static void tun_setup(struct net_device *dev)
>
> dev->ethtool_ops = &tun_ethtool_ops;
> dev->destructor = tun_free_netdev;
> + /* We prefer our own queue length */
> + dev->tx_queue_len = TUN_READQ_SIZE;
> }
>
> /* Trivial set of netlink ops to allow deleting tun or tap
> --
> 2.5.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] tuntap: restore default qdisc
2016-04-08 5:26 [PATCH net] tuntap: restore default qdisc Jason Wang
2016-04-08 7:47 ` Michael S. Tsirkin
@ 2016-04-08 9:02 ` Phil Sutter
2016-04-08 19:53 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Phil Sutter @ 2016-04-08 9:02 UTC (permalink / raw)
To: Jason Wang; +Cc: davem, netdev, linux-kernel, mst
On Fri, Apr 08, 2016 at 01:26:48PM +0800, Jason Wang wrote:
> After commit f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using
> alloc_netdev"), default qdisc was changed to noqueue because
> tuntap does not set tx_queue_len during .setup(). This patch restores
> default qdisc by setting tx_queue_len in tun_setup().
>
> Fixes: f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using alloc_netdev")
> Cc: Phil Sutter <phil@nwl.cc>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Phil Sutter <phil@nwl.cc>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] tuntap: restore default qdisc
2016-04-08 5:26 [PATCH net] tuntap: restore default qdisc Jason Wang
2016-04-08 7:47 ` Michael S. Tsirkin
2016-04-08 9:02 ` Phil Sutter
@ 2016-04-08 19:53 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2016-04-08 19:53 UTC (permalink / raw)
To: jasowang; +Cc: netdev, linux-kernel, mst, phil
From: Jason Wang <jasowang@redhat.com>
Date: Fri, 8 Apr 2016 13:26:48 +0800
> After commit f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using
> alloc_netdev"), default qdisc was changed to noqueue because
> tuntap does not set tx_queue_len during .setup(). This patch restores
> default qdisc by setting tx_queue_len in tun_setup().
>
> Fixes: f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using alloc_netdev")
> Cc: Phil Sutter <phil@nwl.cc>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Applied and queued up for -stable, thanks Jason.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-08 19:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-08 5:26 [PATCH net] tuntap: restore default qdisc Jason Wang
2016-04-08 7:47 ` Michael S. Tsirkin
2016-04-08 9:02 ` Phil Sutter
2016-04-08 19:53 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).