diff options
| author | Pavel Šimerda <psimerda@redhat.com> | 2013-07-04 13:34:44 +0200 |
|---|---|---|
| committer | Pavel Šimerda <psimerda@redhat.com> | 2013-07-04 13:37:26 +0200 |
| commit | 8de1b1732ea6ab697b8cd2c812c470680cd9cb4f (patch) | |
| tree | 3eb64a45c03523d0c4c06c72c5764ad80a387994 /src/nm-ip6-config.h | |
| parent | 6cdc16d147b15b883e0903ffe59dac46bbcda88d (diff) | |
| download | NetworkManager-8de1b1732ea6ab697b8cd2c812c470680cd9cb4f.tar.gz | |
trivial: move merge_ip6_configs() to nm-ip6-config
Diffstat (limited to 'src/nm-ip6-config.h')
| -rw-r--r-- | src/nm-ip6-config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index b051f30678..2b126f86dc 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -60,6 +60,7 @@ gboolean nm_ip6_config_commit (NMIP6Config *config, int ifindex, int priority); void nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIP6Config *setting); /* Utility functions */ +void nm_ip6_config_merge (NMIP6Config *dst, NMIP6Config *src); gboolean nm_ip6_config_destination_is_direct (NMIP6Config *config, const struct in6_addr *dest, guint32 plen); void nm_ip6_config_take_address (NMIP6Config *config, NMIP6Address *address); |