From 35433040575584c9ab39400774ae9c7cfb82678c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 20 May 2019 14:13:11 +0900 Subject: [PATCH] network: deprecate OneQueue= for tun or tap devices IFF_ONE_QUEUE has no effect since kernel-3.8. See kernel's commit 5d097109257c03a71845729f8db6b5770c4bbedc. --- man/systemd.netdev.xml | 9 --------- src/network/netdev/netdev-gperf.gperf | 4 ++-- src/network/netdev/tuntap.c | 3 --- src/network/netdev/tuntap.h | 1 - 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 4b26d9670b..26a5dbbd1e 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -1379,15 +1379,6 @@ keys: - - OneQueue= - Takes a boolean. Configures whether - all packets are queued at the device (enabled), or a fixed - number of packets are queued at the device and the rest at the - qdisc. Defaults to - no. - - MultiQueue= Takes a boolean. Configures whether diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf index 1e1330d7e1..0cf6949968 100644 --- a/src/network/netdev/netdev-gperf.gperf +++ b/src/network/netdev/netdev-gperf.gperf @@ -159,13 +159,13 @@ MACsecReceiveAssociation.KeyId, config_parse_macsec_key_id, MACsecReceiveAssociation.Key, config_parse_macsec_key, 0, 0 MACsecReceiveAssociation.KeyFile, config_parse_macsec_key_file, 0, 0 MACsecReceiveAssociation.Activate, config_parse_macsec_sa_activate, 0, 0 -Tun.OneQueue, config_parse_bool, 0, offsetof(TunTap, one_queue) +Tun.OneQueue, config_parse_warn_compat, DISABLED_LEGACY, 0 Tun.MultiQueue, config_parse_bool, 0, offsetof(TunTap, multi_queue) Tun.PacketInfo, config_parse_bool, 0, offsetof(TunTap, packet_info) Tun.VNetHeader, config_parse_bool, 0, offsetof(TunTap, vnet_hdr) Tun.User, config_parse_string, 0, offsetof(TunTap, user_name) Tun.Group, config_parse_string, 0, offsetof(TunTap, group_name) -Tap.OneQueue, config_parse_bool, 0, offsetof(TunTap, one_queue) +Tap.OneQueue, config_parse_warn_compat, DISABLED_LEGACY, 0 Tap.MultiQueue, config_parse_bool, 0, offsetof(TunTap, multi_queue) Tap.PacketInfo, config_parse_bool, 0, offsetof(TunTap, packet_info) Tap.VNetHeader, config_parse_bool, 0, offsetof(TunTap, vnet_hdr) diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c index 2e3d0625c3..5b799e73a3 100644 --- a/src/network/netdev/tuntap.c +++ b/src/network/netdev/tuntap.c @@ -34,9 +34,6 @@ static int netdev_fill_tuntap_message(NetDev *netdev, struct ifreq *ifr) { if (!t->packet_info) ifr->ifr_flags |= IFF_NO_PI; - if (t->one_queue) - ifr->ifr_flags |= IFF_ONE_QUEUE; - if (t->multi_queue) ifr->ifr_flags |= IFF_MULTI_QUEUE; diff --git a/src/network/netdev/tuntap.h b/src/network/netdev/tuntap.h index 9d9f9922b5..1a1600b055 100644 --- a/src/network/netdev/tuntap.h +++ b/src/network/netdev/tuntap.h @@ -10,7 +10,6 @@ struct TunTap { char *user_name; char *group_name; - bool one_queue; bool multi_queue; bool packet_info; bool vnet_hdr; -- 2.25.1