diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-19 17:30:10 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-11-07 07:49:40 -0500 |
| commit | 3f30c6f1c2f9ce76b24fada0e75fd3cf733ca4bc (patch) | |
| tree | f413fc1880cdeee48d5891d06b3d474142448ee3 /src/nm-ip4-config.h | |
| parent | 39709fdc2ecaf42e431410f9ad425a9fb5c57812 (diff) | |
| download | NetworkManager-3f30c6f1c2f9ce76b24fada0e75fd3cf733ca4bc.tar.gz | |
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes
Split a base NMSettingIPConfig class out of NMSettingIP4Config and
NMSettingIP6Config, and update things accordingly.
Further simplifications of now-redundant IPv4-vs-IPv6 code are
possible, and should happen in the future.
Diffstat (limited to 'src/nm-ip4-config.h')
| -rw-r--r-- | src/nm-ip4-config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 16372be5cd..e9f2642af7 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -61,7 +61,7 @@ const char * nm_ip4_config_get_dbus_path (const NMIP4Config *config); /* Integration with nm-platform and nm-setting */ NMIP4Config *nm_ip4_config_capture (int ifindex, gboolean capture_resolv_conf); gboolean nm_ip4_config_commit (const NMIP4Config *config, int ifindex); -void nm_ip4_config_merge_setting (NMIP4Config *config, NMSettingIP4Config *setting, int default_route_metric); +void nm_ip4_config_merge_setting (NMIP4Config *config, NMSettingIPConfig *setting, int default_route_metric); NMSetting *nm_ip4_config_create_setting (const NMIP4Config *config); /* Utility functions */ |