summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Xu <martin.xu@intel.com>2009-10-31 14:17:43 +0800
committerMarcel Holtmann <marcel@holtmann.org>2009-11-01 00:44:14 +0900
commiteda39c716871305b67ae3e56c8c97184d7dffd66 (patch)
tree134e2836671ceb8766301e967eb7abf2301571fa
parentbe7c2d6f34d1d3a353d149f25aedb2faba401f28 (diff)
downloadconnman-eda39c716871305b67ae3e56c8c97184d7dffd66.tar.gz
connman-eda39c716871305b67ae3e56c8c97184d7dffd66.tar.bz2
connman-eda39c716871305b67ae3e56c8c97184d7dffd66.zip
Remove problematic retry on failure code path
-rw-r--r--src/service.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/service.c b/src/service.c
index db2076f6..b2dc68df 100644
--- a/src/service.c
+++ b/src/service.c
@@ -29,7 +29,6 @@
#include "connman.h"
-#define MAX_CONNECT_RETRIES 2
#define CONNECT_TIMEOUT 120
static DBusConnection *connection = NULL;
@@ -54,7 +53,6 @@ struct connman_service {
connman_bool_t userconnect;
GTimeVal modified;
unsigned int order;
- unsigned int failcounter;
char *name;
char *passphrase;
char *profile;
@@ -1001,7 +999,6 @@ static DBusMessage *connect_service(DBusConnection *conn,
service->ignore = FALSE;
service->userconnect = TRUE;
- service->failcounter = 0;
service->pending = dbus_message_ref(msg);
@@ -1457,7 +1454,6 @@ int __connman_service_indicate_state(struct connman_service *service,
reply_pending(service, 0);
service->userconnect = FALSE;
- service->failcounter = 0;
g_get_current_time(&service->modified);
__connman_storage_save_service(service);
@@ -1472,15 +1468,6 @@ int __connman_service_indicate_state(struct connman_service *service,
}
if (state == CONNMAN_SERVICE_STATE_FAILURE) {
- if (service->failcounter++ < MAX_CONNECT_RETRIES) {
- connman_warn("Connecting again (try %d)",
- service->failcounter);
- remove_timeout(service);
- __connman_service_disconnect(service);
- __connman_service_connect(service);
- return 0;
- }
-
reply_pending(service, EIO);
if (service->userconnect == FALSE)