diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 09:24:19 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 12:01:26 -0500 |
| commit | 240934659cd8326a14324c73d4f0f88eecfddcab (patch) | |
| tree | e07cde48aa0a143bebf10ca7103cc0e69febad25 /src/libnmc-setting/nm-meta-setting-base-impl.h | |
| parent | fbe61ddadf4a89800a8e3651ae91099259ddf2ad (diff) | |
| parent | 1628eda029ba4dede8d4d45572c6b60367882436 (diff) | |
Merge tag 'debian/1.34.0-2' into ubuntu/master
network-manager Debian release 1.34.0-2
Diffstat (limited to 'src/libnmc-setting/nm-meta-setting-base-impl.h')
| -rw-r--r-- | src/libnmc-setting/nm-meta-setting-base-impl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libnmc-setting/nm-meta-setting-base-impl.h b/src/libnmc-setting/nm-meta-setting-base-impl.h index 44bd9024..eba1fb96 100644 --- a/src/libnmc-setting/nm-meta-setting-base-impl.h +++ b/src/libnmc-setting/nm-meta-setting-base-impl.h @@ -110,6 +110,7 @@ typedef enum _nm_packed { NM_META_SETTING_TYPE_ADSL, NM_META_SETTING_TYPE_BLUETOOTH, NM_META_SETTING_TYPE_BOND, + NM_META_SETTING_TYPE_BOND_PORT, NM_META_SETTING_TYPE_BRIDGE, NM_META_SETTING_TYPE_BRIDGE_PORT, NM_META_SETTING_TYPE_CDMA, @@ -159,9 +160,9 @@ typedef enum _nm_packed { } NMMetaSettingType; #if _NM_META_SETTING_BASE_IMPL_LIBNM - #define _NMMetaSettingInfo_Alias _NMMetaSettingInfo +#define _NMMetaSettingInfo_Alias _NMMetaSettingInfo #else - #define _NMMetaSettingInfo_Alias _NMMetaSettingInfoCli +#define _NMMetaSettingInfo_Alias _NMMetaSettingInfoCli #endif struct _NMMetaSettingInfo_Alias { |