diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-07-05 21:42:56 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-07-05 21:42:56 +0000 |
| commit | d2a5052d90e8c96f7cd9e65fc4a518f594c2f865 (patch) | |
| tree | 0e47658b33c55bf578ea6a83f3d895f4acc873d1 | |
| parent | 2e98c7cc4abbb4b1cdfcb3222e23b7201d9f516b (diff) | |
| download | NetworkManager-d2a5052d90e8c96f7cd9e65fc4a518f594c2f865.tar.gz | |
2007-07-05 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-mesh-olpc.c
- (real_act_stage1_prepare): if the activation is user-requested, start
all over at mesh stage 1 (school MPP)
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/nm-0-6-olpc@2627 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/nm-device-802-11-mesh-olpc.c | 8 |
2 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2007-07-05 Dan Williams <dcbw@redhat.com> + + * src/nm-device-802-11-mesh-olpc.c + - (real_act_stage1_prepare): if the activation is user-requested, start + all over at mesh stage 1 (school MPP) + 2007-07-03 Dan Williams <dcbw@redhat.com> * src/nm-device-802-11-mesh-olpc.c diff --git a/src/nm-device-802-11-mesh-olpc.c b/src/nm-device-802-11-mesh-olpc.c index 3b88de278c..ea70d0349a 100644 --- a/src/nm-device-802-11-mesh-olpc.c +++ b/src/nm-device-802-11-mesh-olpc.c @@ -1470,6 +1470,14 @@ real_act_stage1_prepare (NMDevice *dev, NMActRequest *req) nm_device_set_active_link (dev, TRUE); + /* If the user requested reassociation on the mesh device, + * go back to the the start of the association process. + */ + if (nm_act_request_get_user_requested (req)) { + self->priv->step = MESH_S1_SCHOOL_MPP; + self->priv->channel = 1; + } + /* Stop being an MPP if we currently are one */ if (self->priv->mpp.primary) mpp_cleanup (self); |