diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-06-23 17:00:24 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-01 16:00:21 +0200 |
| commit | 85bf9ded2ef37938d92fd64f003713bee4ca492e (patch) | |
| tree | a707d6d59e3c8566ea83452715110434ec8aa4f4 | |
| parent | e7f3ccf7cdb5b5d1765b434c71cf622a6a31a966 (diff) | |
| download | NetworkManager-85bf9ded2ef37938d92fd64f003713bee4ca492e.tar.gz | |
platform/trivial: rename enum value NM_IP_CONFIG_SOURCE_RTPROT_KERNEL
This source type was platform internal up to now. Next we will expose it.
| -rw-r--r-- | src/nm-types.h | 4 | ||||
| -rw-r--r-- | src/platform/nm-linux-platform.c | 4 | ||||
| -rw-r--r-- | src/platform/nm-platform.c | 2 | ||||
| -rw-r--r-- | src/platform/nmp-object.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/nm-types.h b/src/nm-types.h index 426aba5a27..530f9f7b5b 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -55,8 +55,8 @@ typedef enum { /* platform internal flag used to mark routes with RTM_F_CLONED. */ _NM_IP_CONFIG_SOURCE_RTM_F_CLONED, - /* platform internal flag used to mark routes with protocol RTPROT_KERNEL. */ - _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL, + /* routes from platform with protocol RTPROT_KERNEL. */ + NM_IP_CONFIG_SOURCE_RTPROT_KERNEL, NM_IP_CONFIG_SOURCE_KERNEL, NM_IP_CONFIG_SOURCE_SHARED, diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index c9e5c7f6f4..4e9a468f00 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -597,7 +597,7 @@ _nm_ip_config_source_to_rtprot (NMIPConfigSource source) case NM_IP_CONFIG_SOURCE_UNKNOWN: return RTPROT_UNSPEC; case NM_IP_CONFIG_SOURCE_KERNEL: - case _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL: + case NM_IP_CONFIG_SOURCE_RTPROT_KERNEL: return RTPROT_KERNEL; case NM_IP_CONFIG_SOURCE_DHCP: return RTPROT_DHCP; @@ -616,7 +616,7 @@ _nm_ip_config_source_from_rtprot (guint rtprot) case RTPROT_UNSPEC: return NM_IP_CONFIG_SOURCE_UNKNOWN; case RTPROT_KERNEL: - return _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL; + return NM_IP_CONFIG_SOURCE_RTPROT_KERNEL; case RTPROT_REDIRECT: return NM_IP_CONFIG_SOURCE_KERNEL; case RTPROT_RA: diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index cc52be418c..0ee9551f8a 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -2281,7 +2281,7 @@ static const char * source_to_string (NMIPConfigSource source) { switch (source) { - case _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL: + case NM_IP_CONFIG_SOURCE_RTPROT_KERNEL: return "rtprot-kernel"; case _NM_IP_CONFIG_SOURCE_RTM_F_CLONED: return "rtm-f-cloned"; diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 77e7b15b99..0750fa7492 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -786,7 +786,7 @@ _vt_cmd_obj_is_visible_ipx_route (const NMPObject *obj) { NMIPConfigSource source = obj->ip_route.source; - return obj->object.ifindex > 0 && (source != _NM_IP_CONFIG_SOURCE_RTPROT_KERNEL && source != _NM_IP_CONFIG_SOURCE_RTM_F_CLONED); + return obj->object.ifindex > 0 && (source != NM_IP_CONFIG_SOURCE_RTPROT_KERNEL && source != _NM_IP_CONFIG_SOURCE_RTM_F_CLONED); } /******************************************************************/ |