Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 016adb72 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

tuntap: restore default qdisc 



After commit f84bb1ea ("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: f84bb1ea ("net: fix IFF_NO_QUEUE for drivers using alloc_netdev")
Cc: Phil Sutter <phil@nwl.cc>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarPhil Sutter <phil@nwl.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94a57f1f

drivers/net/tun.c

+2 −2
Original line number Diff line number Diff line
@@ -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