diff options
Diffstat (limited to 'src/libnm-core-impl')
| -rw-r--r-- | src/libnm-core-impl/nm-meta-setting-base-impl.c | 8 | ||||
| -rw-r--r-- | src/libnm-core-impl/nm-setting-macvlan.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libnm-core-impl/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c index 37cb61f1..b9dcf34f 100644 --- a/src/libnm-core-impl/nm-meta-setting-base-impl.c +++ b/src/libnm-core-impl/nm-meta-setting-base-impl.c @@ -431,7 +431,7 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = { [NM_META_SETTING_TYPE_OVS_DPDK] = { .meta_type = NM_META_SETTING_TYPE_OVS_DPDK, - .setting_priority = NM_SETTING_PRIORITY_HW_BASE, + .setting_priority = NM_SETTING_PRIORITY_AUX, .setting_name = NM_SETTING_OVS_DPDK_SETTING_NAME, .get_setting_gtype = nm_setting_ovs_dpdk_get_type, }, @@ -459,7 +459,7 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = { [NM_META_SETTING_TYPE_OVS_PATCH] = { .meta_type = NM_META_SETTING_TYPE_OVS_PATCH, - .setting_priority = NM_SETTING_PRIORITY_HW_BASE, + .setting_priority = NM_SETTING_PRIORITY_AUX, .setting_name = NM_SETTING_OVS_PATCH_SETTING_NAME, .get_setting_gtype = nm_setting_ovs_patch_get_type, }, @@ -656,9 +656,7 @@ const NMMetaSettingType nm_meta_setting_types_by_priority[] = { NM_META_SETTING_TYPE_MACSEC, NM_META_SETTING_TYPE_MACVLAN, NM_META_SETTING_TYPE_OVS_BRIDGE, - NM_META_SETTING_TYPE_OVS_DPDK, NM_META_SETTING_TYPE_OVS_INTERFACE, - NM_META_SETTING_TYPE_OVS_PATCH, NM_META_SETTING_TYPE_OVS_PORT, NM_META_SETTING_TYPE_TEAM, NM_META_SETTING_TYPE_TUN, @@ -688,8 +686,10 @@ const NMMetaSettingType nm_meta_setting_types_by_priority[] = { NM_META_SETTING_TYPE_ETHTOOL, NM_META_SETTING_TYPE_LINK, NM_META_SETTING_TYPE_MATCH, + NM_META_SETTING_TYPE_OVS_DPDK, NM_META_SETTING_TYPE_OVS_EXTERNAL_IDS, NM_META_SETTING_TYPE_OVS_OTHER_CONFIG, + NM_META_SETTING_TYPE_OVS_PATCH, NM_META_SETTING_TYPE_PPP, NM_META_SETTING_TYPE_PPPOE, NM_META_SETTING_TYPE_TEAM_PORT, diff --git a/src/libnm-core-impl/nm-setting-macvlan.c b/src/libnm-core-impl/nm-setting-macvlan.c index 2adecdfe..41d41a53 100644 --- a/src/libnm-core-impl/nm-setting-macvlan.c +++ b/src/libnm-core-impl/nm-setting-macvlan.c @@ -251,7 +251,7 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass) /** * NMSettingMacvlan:promiscuous: * - * Whether the interface should be put in promiscuous mode. + * Whether the parent interface should be put in promiscuous mode (true by default). * * Since: 1.2 **/ |