From 7b280fa1625a89844a81eefe6598a26998e0089f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 11 Apr 2016 12:49:47 +0200 Subject: [PATCH] core: expose NMIPAddress instances with prefix zero on D-Bus Since commit 44768f0311deb9082c69e3525693091a59788ebb, we skip exposing NMIPAddress instances with prefix zero. Now, that is supported and we can remove the check. (cherry picked from commit 420bd611fdbf78a33f5dcb9697238527b87c77d4) --- src/nm-ip4-config.c | 4 ---- src/nm-ip6-config.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index d6f6a9b3fc..75caf7e33c 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -567,10 +567,6 @@ nm_ip4_config_create_setting (const NMIP4Config *config) continue; } - /* FIXME: NMIPAddress doesn't support zero prefixes. */ - if (address->plen == 0) - continue; - /* Static address found. */ if (!method) method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL; diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 0b32901bf1..8e7bd22cc1 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -556,10 +556,6 @@ nm_ip6_config_create_setting (const NMIP6Config *config) continue; } - /* FIXME: NMIPAddress does not support zero prefixes. */ - if (address->plen == 0) - continue; - /* Static address found. */ if (!method || strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0) method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;