diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-02 16:45:07 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-02 16:45:07 +0100 |
| commit | 0c97fcc238b47c61de3d6834458a1354a6e9ddfb (patch) | |
| tree | a6f78788bd54024b201e662a5539057a64e5a9cf /plugins | |
| parent | 838e712a151514f228eac2901aed8c452e45c019 (diff) | |
| download | connman-0c97fcc238b47c61de3d6834458a1354a6e9ddfb.tar.gz connman-0c97fcc238b47c61de3d6834458a1354a6e9ddfb.tar.bz2 connman-0c97fcc238b47c61de3d6834458a1354a6e9ddfb.zip | |
ofono: Remove set_connected forward declaration
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ofono.c | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/plugins/ofono.c b/plugins/ofono.c index 51997c85..3f4e9867 100644 --- a/plugins/ofono.c +++ b/plugins/ofono.c @@ -409,7 +409,31 @@ static gboolean pending_network_is_available(struct connman_network *network) } static void set_connected(struct network_info *info, - connman_bool_t connected); + connman_bool_t connected) +{ + DBG("network %p connected %d", info->network, connected); + + switch (info->method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + case CONNMAN_IPCONFIG_METHOD_AUTO: + return; + + case CONNMAN_IPCONFIG_METHOD_FIXED: + connman_network_set_ipv4_method(info->network, info->method); + connman_network_set_ipaddress(info->network, &info->ipaddress); + + break; + + case CONNMAN_IPCONFIG_METHOD_DHCP: + connman_network_set_ipv4_method(info->network, info->method); + + break; + } + + connman_network_set_connected(info->network, connected); +} static void set_active_reply(DBusPendingCall *call, void *user_data) { @@ -1682,33 +1706,6 @@ static void update_settings(DBusMessageIter *array, g_free(gateway); } -static void set_connected(struct network_info *info, - connman_bool_t connected) -{ - DBG("network %p connected %d", info->network, connected); - - switch (info->method) { - case CONNMAN_IPCONFIG_METHOD_UNKNOWN: - case CONNMAN_IPCONFIG_METHOD_OFF: - case CONNMAN_IPCONFIG_METHOD_MANUAL: - case CONNMAN_IPCONFIG_METHOD_AUTO: - return; - - case CONNMAN_IPCONFIG_METHOD_FIXED: - connman_network_set_ipv4_method(info->network, info->method); - connman_network_set_ipaddress(info->network, &info->ipaddress); - - break; - - case CONNMAN_IPCONFIG_METHOD_DHCP: - connman_network_set_ipv4_method(info->network, info->method); - - break; - } - - connman_network_set_connected(info->network, connected); -} - static gboolean context_changed(DBusConnection *connection, DBusMessage *message, void *user_data) { |