diff options
| author | Jukka Rissanen <jukka.rissanen@nokia.com> | 2011-01-07 14:55:14 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-08 00:46:34 +0100 |
| commit | 00f76b672c227aa81195b5caf843349649e6ee25 (patch) | |
| tree | b695f8a01c92f901cd75a25e8a9f841981b9a476 /src | |
| parent | 0d1d0716df85e31e728066cf489452a5bec3cd63 (diff) | |
| download | connman-00f76b672c227aa81195b5caf843349649e6ee25.tar.gz connman-00f76b672c227aa81195b5caf843349649e6ee25.tar.bz2 connman-00f76b672c227aa81195b5caf843349649e6ee25.zip | |
ipconfig: Removed obsolete parameter from __connman_ipconfig_set_config()
Diffstat (limited to 'src')
| -rw-r--r-- | src/connman.h | 2 | ||||
| -rw-r--r-- | src/ipconfig.c | 10 | ||||
| -rw-r--r-- | src/service.c | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/connman.h b/src/connman.h index fb269995..b58f9039 100644 --- a/src/connman.h +++ b/src/connman.h @@ -240,7 +240,7 @@ void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig, DBusMessageIter *iter); int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, - enum connman_ipconfig_type type, DBusMessageIter *array); + DBusMessageIter *array); void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig, DBusMessageIter *iter); enum connman_ipconfig_method __connman_ipconfig_get_method( diff --git a/src/ipconfig.c b/src/ipconfig.c index 7a14c42b..bdfbbe5c 100644 --- 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, - 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, @@ -1521,11 +1521,7 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, 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; @@ -1601,7 +1597,7 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, 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 diff --git a/src/service.c b/src/service.c index 9338ca1a..01e52f2b 100644 --- a/src/service.c +++ b/src/service.c @@ -2061,11 +2061,11 @@ static DBusMessage *set_property(DBusConnection *conn, if (g_str_equal(name, "IPv4.Configuration") == TRUE) { type = CONNMAN_IPCONFIG_TYPE_IPV4; err = __connman_ipconfig_set_config( - service->ipconfig_ipv4, type, &value); + service->ipconfig_ipv4, &value); } else if (g_str_equal(name, "IPv6.Configuration") == TRUE) { type = CONNMAN_IPCONFIG_TYPE_IPV6; err = __connman_ipconfig_set_config( - service->ipconfig_ipv6, type, &value); + service->ipconfig_ipv6, &value); } if (err < 0) { |