shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-12 09:17:44 +03:00
Code

network: deprecate OneQueue= for tun or tap devices

Browse Source 
IFF_ONE_QUEUE has no effect since kernel-3.8. See kernel's commit
5d097109257c03a71845729f8db6b5770c4bbedc.
This commit is contained in:
Yu Watanabe 2019-05-20 14:13:11 +09:00
parent 2746d30797
commit 3543304057
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man/systemd.netdev.xml
View File

@ -1379,15 +1379,6 @@
keys:</para> keys:</para>
<variablelist class='network-directives'> <variablelist class='network-directives'>
<varlistentry>
<term><varname>OneQueue=</varname></term>
<listitem><para>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
<literal>qdisc</literal>. Defaults to
<literal>no</literal>.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>MultiQueue=</varname></term> <term><varname>MultiQueue=</varname></term>
<listitem><para>Takes a boolean. Configures whether <listitem><para>Takes a boolean. Configures whether

4
src/network/netdev/netdev-gperf.gperf
View File

@ -159,13 +159,13 @@ MACsecReceiveAssociation.KeyId, config_parse_macsec_key_id,
MACsecReceiveAssociation.Key, config_parse_macsec_key, 0, 0 MACsecReceiveAssociation.Key, config_parse_macsec_key, 0, 0
MACsecReceiveAssociation.KeyFile, config_parse_macsec_key_file, 0, 0 MACsecReceiveAssociation.KeyFile, config_parse_macsec_key_file, 0, 0
MACsecReceiveAssociation.Activate, config_parse_macsec_sa_activate, 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.MultiQueue, config_parse_bool, 0, offsetof(TunTap, multi_queue)
Tun.PacketInfo, config_parse_bool, 0, offsetof(TunTap, packet_info) Tun.PacketInfo, config_parse_bool, 0, offsetof(TunTap, packet_info)
Tun.VNetHeader, config_parse_bool, 0, offsetof(TunTap, vnet_hdr) Tun.VNetHeader, config_parse_bool, 0, offsetof(TunTap, vnet_hdr)
Tun.User, config_parse_string, 0, offsetof(TunTap, user_name) Tun.User, config_parse_string, 0, offsetof(TunTap, user_name)
Tun.Group, config_parse_string, 0, offsetof(TunTap, group_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.MultiQueue, config_parse_bool, 0, offsetof(TunTap, multi_queue)
Tap.PacketInfo, config_parse_bool, 0, offsetof(TunTap, packet_info) Tap.PacketInfo, config_parse_bool, 0, offsetof(TunTap, packet_info)
Tap.VNetHeader, config_parse_bool, 0, offsetof(TunTap, vnet_hdr) Tap.VNetHeader, config_parse_bool, 0, offsetof(TunTap, vnet_hdr)

3
src/network/netdev/tuntap.c
View File

@ -34,9 +34,6 @@ static int netdev_fill_tuntap_message(NetDev *netdev, struct ifreq *ifr) {
if (!t->packet_info) if (!t->packet_info)
ifr->ifr_flags |= IFF_NO_PI; ifr->ifr_flags |= IFF_NO_PI;
if (t->one_queue)
ifr->ifr_flags |= IFF_ONE_QUEUE;
if (t->multi_queue) if (t->multi_queue)
ifr->ifr_flags |= IFF_MULTI_QUEUE; ifr->ifr_flags |= IFF_MULTI_QUEUE;

1
src/network/netdev/tuntap.h
View File

@ -10,7 +10,6 @@ struct TunTap {
char *user_name; char *user_name;
char *group_name; char *group_name;
bool one_queue;
bool multi_queue; bool multi_queue;
bool packet_info; bool packet_info;
bool vnet_hdr; bool vnet_hdr;