projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipconfig: Removed obsolete parameter from __connman_ipconfig_set_config()
[platform/upstream/connman.git]
/
src
/
ipconfig.c
diff --git
a/src/ipconfig.c
b/src/ipconfig.c
index
7a14c42
..
bdfbbe5
100644
(file)
--- a/
src/ipconfig.c
+++ b/
src/ipconfig.c
@@
-1513,7
+1513,7
@@
void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
}
int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
}
int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
-
enum connman_ipconfig_type type,
DBusMessageIter *array)
+
DBusMessageIter *array)
{
enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
const char *address = NULL, *netmask = NULL, *gateway = NULL,
{
enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
const char *address = NULL, *netmask = NULL, *gateway = NULL,
@@
-1521,11
+1521,7
@@
int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
int prefix_length = 0;
DBusMessageIter dict;
int prefix_length = 0;
DBusMessageIter dict;
- DBG("ipconfig %p type %d", ipconfig, type);
-
- if (type != CONNMAN_IPCONFIG_TYPE_IPV4 &&
- type != CONNMAN_IPCONFIG_TYPE_IPV6)
- return -EINVAL;
+ DBG("ipconfig %p", ipconfig);
if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
return -EINVAL;
if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
return -EINVAL;
@@
-1601,7
+1597,7
@@
int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
ipconfig->method = method;
ipconfig->method = method;
- if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ if (
ipconfig->
type == CONNMAN_IPCONFIG_TYPE_IPV4)
connman_ipaddress_set_ipv4(ipconfig->address,
address, netmask, gateway);
else
connman_ipaddress_set_ipv4(ipconfig->address,
address, netmask, gateway);
else