From 358d4286d2c9772d9ab7302fedf8697006504347 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Thu, 16 Jun 2011 09:44:53 +0200 Subject: [PATCH] network: Remove unused network_driver->setup() --- include/network.h | 1 - src/network.c | 14 +------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/include/network.h b/include/network.h index 0649a4d..c5742ab 100644 --- a/include/network.h +++ b/include/network.h @@ -148,7 +148,6 @@ struct connman_network_driver { void (*remove) (struct connman_network *network); int (*connect) (struct connman_network *network); int (*disconnect) (struct connman_network *network); - int (*setup) (struct connman_network *network, const char *key); }; int connman_network_driver_register(struct connman_network_driver *driver); diff --git a/src/network.c b/src/network.c index 95b4d4a..8af90f8 100644 --- a/src/network.c +++ b/src/network.c @@ -1342,8 +1342,6 @@ int connman_network_set_roaming(struct connman_network *network, int connman_network_set_string(struct connman_network *network, const char *key, const char *value) { - int err; - DBG("network %p key %s value %s", network, key, value); if (g_strcmp0(key, "Name") == 0) @@ -1387,17 +1385,7 @@ int connman_network_set_string(struct connman_network *network, network->wifi.pin_wps = g_strdup(value); } - err = connman_element_set_string(&network->element, key, value); - if (err < 0) - return err; - - if (network->driver == NULL) - return 0; - - if (network->driver->setup) - return network->driver->setup(network, key); - - return 0; + return connman_element_set_string(&network->element, key, value); } /** -- 2.7.4