projects
/
platform
/
upstream
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6be58c
)
Remove wrongly committed connection patch for supplicant
author
Marcel Holtmann
<marcel@holtmann.org>
Thu, 16 Jul 2009 00:45:00 +0000
(
02:45
+0200)
committer
Marcel Holtmann
<marcel@holtmann.org>
Thu, 16 Jul 2009 00:45:00 +0000
(
02:45
+0200)
plugins/supplicant.c
patch
|
blob
|
history
diff --git
a/plugins/supplicant.c
b/plugins/supplicant.c
index
958200e
..
b964ae7
100644
(file)
--- a/
plugins/supplicant.c
+++ b/
plugins/supplicant.c
@@
-185,7
+185,6
@@
struct supplicant_task {
gboolean noscan;
GSList *scan_results;
struct iw_range *range;
gboolean noscan;
GSList *scan_results;
struct iw_range *range;
- gboolean connecting;
gboolean disconnecting;
};
gboolean disconnecting;
};
@@
-1495,8
+1494,6
@@
static int task_connect(struct supplicant_task *task)
if (g_str_equal(security, "none") == FALSE && passphrase == NULL)
return -EINVAL;
if (g_str_equal(security, "none") == FALSE && passphrase == NULL)
return -EINVAL;
- task->connecting = TRUE;
-
add_network(task);
select_network(task);
add_network(task);
select_network(task);
@@
-1596,7
+1593,6
@@
static void state_change(struct supplicant_task *task, DBusMessage *msg)
/* carrier on */
connman_network_set_connected(task->network, TRUE);
connman_device_set_scanning(task->device, FALSE);
/* carrier on */
connman_network_set_connected(task->network, TRUE);
connman_device_set_scanning(task->device, FALSE);
- task->connecting = FALSE;
break;
case WPA_DISCONNECTED:
break;
case WPA_DISCONNECTED:
@@
-1614,7
+1610,6
@@
static void state_change(struct supplicant_task *task, DBusMessage *msg)
/* carrier off */
connman_network_set_connected(task->network, FALSE);
connman_device_set_scanning(task->device, FALSE);
/* carrier off */
connman_network_set_connected(task->network, FALSE);
connman_device_set_scanning(task->device, FALSE);
- task->connecting = FALSE;
}
break;
}
break;
@@
-1694,7
+1689,6
@@
int supplicant_start(struct connman_device *device)
task->created = FALSE;
task->noscan = FALSE;
task->state = WPA_INVALID;
task->created = FALSE;
task->noscan = FALSE;
task->state = WPA_INVALID;
- task->connecting = FALSE;
task->disconnecting = FALSE;
task->pending_network = NULL;
task->disconnecting = FALSE;
task->pending_network = NULL;