---
src/network.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/network.c b/src/network.c
index bf01767..00da077 100644
--- a/src/network.c
+++ b/src/network.c
@@ -459,7 +459,7 @@ const char *connman_network_get_identifier(struct
connman_network *network)
*
* Set index number of network
*/
-void connman_network_set_index(struct connman_network *network, int index)
+void connman_network_set_index(struct connman_network *network, int ifindex)
{
struct connman_service *service;
struct connman_ipconfig *ipconfig;
@@ -482,20 +482,20 @@ void connman_network_set_index(struct connman_network
*network, int index)
* ipconfig layer yet, due to not being able to get
* a network index prior to creating a service.
*/
- __connman_service_create_ip4config(service, index);
+ __connman_service_create_ip4config(service, ifindex);
else
- __connman_ipconfig_set_index(ipconfig, index);
+ __connman_ipconfig_set_index(ipconfig, ifindex);
} else {
/* If index changed, the index of ipconfig must be reset. */
if (ipconfig == NULL)
goto done;
- __connman_ipconfig_set_index(ipconfig, index);
+ __connman_ipconfig_set_index(ipconfig, ifindex);
}
done:
- network->index = index;
+ network->index = ifindex;
}
/**
@@ -1158,11 +1158,11 @@ static void receive_refresh_rs_reply(struct
nd_router_advert *reply,
return;
}
-int __connman_refresh_rs_ipv6(struct connman_network *network, int index)
+int __connman_refresh_rs_ipv6(struct connman_network *network, int ifindex)
{
int ret = 0;
- DBG("network %p index %d", network, index);
+ DBG("network %p index %d", network, ifindex);
/* Send only one RS for all RDNSS entries which are about to expire */
if (network->router_solicit_refresh_count > 0) {
@@ -1174,7 +1174,7 @@ int __connman_refresh_rs_ipv6(struct connman_network
*network, int index)
connman_network_ref(network);
- ret = __connman_inet_ipv6_send_rs(index, RS_REFRESH_TIMEOUT,
+ ret = __connman_inet_ipv6_send_rs(ifindex, RS_REFRESH_TIMEOUT,
receive_refresh_rs_reply, network);
return ret;
}
@@ -1183,7 +1183,7 @@ static void autoconf_ipv6_set(struct connman_network
*network)
{
struct connman_service *service;
struct connman_ipconfig *ipconfig;
- int index;
+ int ifindex;
DBG("network %p", network);
@@ -1211,13 +1211,13 @@ static void autoconf_ipv6_set(struct connman_network
*network)
if (ipconfig == NULL)
return;
- index = __connman_ipconfig_get_index(ipconfig);
+ ifindex = __connman_ipconfig_get_index(ipconfig);
connman_network_ref(network);
/* Try to get stateless DHCPv6 information, RFC 3736 */
network->router_solicit_count = 3;
- __connman_inet_ipv6_send_rs(index, 1, check_dhcpv6, network);
+ __connman_inet_ipv6_send_rs(ifindex, 1, check_dhcpv6, network);
}
static void set_connected(struct connman_network *network)
--
1.7.9.5
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
