summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-07-02 19:32:34 +0000
committerDan Williams <dcbw@redhat.com>2007-07-02 19:32:34 +0000
commit4d686954d5b118506a027ce0bdbbabbb46e67566 (patch)
treefadbbefd70ea746ee1fa3d5e2461ca68bf5e0b1d
parentb03ad97b00c0563cfb40bf0d460cfdc980996066 (diff)
downloadNetworkManager-4d686954d5b118506a027ce0bdbbabbb46e67566.tar.gz
2007-07-02 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-mesh-olpc.c - (channel_failure_handler): handle failure of p2p mesh case too git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/nm-0-6-olpc@2623 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
-rw-r--r--ChangeLog5
-rw-r--r--src/nm-device-802-11-mesh-olpc.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 018488a697..0231d61598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2007-07-02 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-mesh-olpc.c
+ - (channel_failure_handler): handle failure of p2p mesh case too
+
+2007-07-02 Dan Williams <dcbw@redhat.com>
+
+ * src/nm-device-802-11-mesh-olpc.c
- Clean up output of unhandled mesh stage error messages
2007-06-28 Dan Williams <dcbw@redhat.com>
diff --git a/src/nm-device-802-11-mesh-olpc.c b/src/nm-device-802-11-mesh-olpc.c
index 417f41c078..b0d1749f90 100644
--- a/src/nm-device-802-11-mesh-olpc.c
+++ b/src/nm-device-802-11-mesh-olpc.c
@@ -1367,6 +1367,9 @@ channel_failure_handler (NMDevice80211MeshOLPC *self, NMActRequest *req)
}
self->priv->channel++;
break;
+ case MESH_S4_P2P_MESH:
+ fail = TRUE;
+ break;
default:
nm_info ("%s: %s():%d unhandled step %d",
nm_device_get_iface (NM_DEVICE (self)),