From: Daniel Wagner <[email protected]>
To avoid a name clash with next patch, this function
is renamed to connman_network_set_binary_address.
---
include/network.h | 2 +-
plugins/wifi.c | 2 +-
src/network.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/network.h b/include/network.h
index 6b93f16..99ebcdb 100644
--- a/include/network.h
+++ b/include/network.h
@@ -96,7 +96,7 @@ void connman_network_set_ipv4_method(struct connman_network
*network,
void connman_network_set_ipv6_method(struct connman_network *network,
enum connman_ipconfig_method method);
-int connman_network_set_address(struct connman_network *network,
+int connman_network_set_binary_address(struct connman_network *network,
const void *address, unsigned int size);
int connman_network_set_name(struct connman_network *network,
const char *name);
diff --git a/plugins/wifi.c b/plugins/wifi.c
index b943a25..fe05007 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -675,7 +675,7 @@ static void interface_state(GSupplicantInterface *interface)
connman_device_schedule_scan(device);
if (get_bssid(device, bssid, &bssid_len) == 0)
- connman_network_set_address(network,
+ connman_network_set_binary_address(network,
bssid, bssid_len);
connman_network_set_connected(network, TRUE);
break;
diff --git a/src/network.c b/src/network.c
index adeba79..8a9b9af 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1192,14 +1192,14 @@ int __connman_network_set_ipconfig(struct
connman_network *network,
}
/**
- * connman_network_set_address:
+ * connman_network_set_binary_address:
* @network: network structure
* @address: binary address value
* @size: binary address length
*
* Set unique address value for network
*/
-int connman_network_set_address(struct connman_network *network,
+int connman_network_set_binary_address(struct connman_network *network,
const void *address, unsigned int size)
{
const unsigned char *addr_octet = address;
@@ -1531,7 +1531,7 @@ int connman_network_set_blob(struct connman_network
*network,
DBG("network %p key %s size %d", network, key, size);
if (g_strcmp0(key, "Address") == 0)
- return connman_network_set_address(network, data, size);
+ return connman_network_set_binary_address(network, data, size);
if (g_str_equal(key, "WiFi.SSID") == TRUE) {
g_free(network->wifi.ssid);
--
1.7.4
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
