colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/trivial: rename functions (NMIPConfigSource conversion)

Browse Source
This commit is contained in:
Thomas Haller
2015-05-29 09:55:51 +02:00
parent 37df41a38e
commit 5b80be5a2c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/platform/nm-linux-platform.c
View File

@@ -570,7 +570,7 @@ _support_kernel_extended_ifa_flags_get (void)
******************************************************************/ ******************************************************************/
static guint static guint
source_to_rtprot (NMIPConfigSource source) _nm_ip_config_source_to_rtprot (NMIPConfigSource source)
{ {
switch (source) { switch (source) {
case NM_IP_CONFIG_SOURCE_UNKNOWN: case NM_IP_CONFIG_SOURCE_UNKNOWN:
@@ -589,7 +589,7 @@ source_to_rtprot (NMIPConfigSource source)
} }
static NMIPConfigSource static NMIPConfigSource
rtprot_to_source (guint rtprot) _nm_ip_config_source_from_rtprot (guint rtprot)
{ {
switch (rtprot) { switch (rtprot) {
case RTPROT_UNSPEC: case RTPROT_UNSPEC:
@@ -1273,7 +1273,7 @@ _nmp_vt_cmd_plobj_init_from_nl_ip4_route (NMPlatform *platform, NMPlatformObject
* */ * */
obj->source = _NM_IP_CONFIG_SOURCE_RTM_F_CLONED; obj->source = _NM_IP_CONFIG_SOURCE_RTM_F_CLONED;
} else } else
obj->source = rtprot_to_source (rtnl_route_get_protocol (nlo)); obj->source = _nm_ip_config_source_from_rtprot (rtnl_route_get_protocol (nlo));
return TRUE; return TRUE;
} }
@@ -1323,7 +1323,7 @@ _nmp_vt_cmd_plobj_init_from_nl_ip6_route (NMPlatform *platform, NMPlatformObject
if (rtnl_route_get_flags (nlo) & RTM_F_CLONED) if (rtnl_route_get_flags (nlo) & RTM_F_CLONED)
obj->source = _NM_IP_CONFIG_SOURCE_RTM_F_CLONED; obj->source = _NM_IP_CONFIG_SOURCE_RTM_F_CLONED;
else else
obj->source = rtprot_to_source (rtnl_route_get_protocol (nlo)); obj->source = _nm_ip_config_source_from_rtprot (rtnl_route_get_protocol (nlo));
return TRUE; return TRUE;
} }
@@ -4300,7 +4300,7 @@ build_rtnl_route (int family, int ifindex, NMIPConfigSource source,
rtnl_route_set_dst (rtnlroute, dst); rtnl_route_set_dst (rtnlroute, dst);
rtnl_route_set_priority (rtnlroute, metric); rtnl_route_set_priority (rtnlroute, metric);
rtnl_route_set_family (rtnlroute, family); rtnl_route_set_family (rtnlroute, family);
rtnl_route_set_protocol (rtnlroute, source_to_rtprot (source)); rtnl_route_set_protocol (rtnlroute, _nm_ip_config_source_to_rtprot (source));
nexthop = _nl_rtnl_route_nh_alloc (); nexthop = _nl_rtnl_route_nh_alloc ();
rtnl_route_nh_set_ifindex (nexthop, ifindex); rtnl_route_nh_set_ifindex (nexthop, ifindex);