From: Daniel Wagner <[email protected]>
To avoid name clash with next patch.
---
src/connman.h | 2 +-
src/ipconfig.c | 2 +-
src/network.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index 0bf69aa..2917b03 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -250,7 +250,7 @@ void __connman_ipconfig_set_element_ipv6_gateway(
struct connman_ipconfig *ipconfig,
struct connman_element *element);
-int __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig,
+int __connman_ipconfig_set_gateway_from_element(struct connman_ipconfig
*ipconfig,
struct connman_element *parent);
int __connman_ipconfig_set_address(struct connman_ipconfig *ipconfig);
int __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig);
diff --git a/src/ipconfig.c b/src/ipconfig.c
index 1e85eb0..7975c9e 100644
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -1164,7 +1164,7 @@ void __connman_ipconfig_set_element_ipv6_gateway(
* FIXME: The element soulution should be removed in the future
* Set IPv4 and IPv6 gateway
*/
-int __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig,
+int __connman_ipconfig_set_gateway_from_element(struct connman_ipconfig
*ipconfig,
struct connman_element *parent)
{
struct connman_element *connection;
diff --git a/src/network.c b/src/network.c
index 4832606..24f5805 100644
--- a/src/network.c
+++ b/src/network.c
@@ -694,7 +694,7 @@ static void set_connected_manual(struct connman_network
*network)
nameserver);
}
- __connman_ipconfig_set_gateway(ipconfig, &network->element);
+ __connman_ipconfig_set_gateway_from_element(ipconfig,
&network->element);
network->connecting = FALSE;
@@ -1028,7 +1028,7 @@ static int manual_ipv4_set(struct connman_network
*network,
return err;
}
- __connman_ipconfig_set_gateway(ipconfig, &network->element);
+ __connman_ipconfig_set_gateway_from_element(ipconfig,
&network->element);
__connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY);
--
1.7.4
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
