From 3fb8cdb35fca27cef848f0e2046fd3fa9c2750ee Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 3 May 2010 00:59:06 -0700 Subject: [PATCH] mesh: let parent class handle IP config timeout --- src/nm-device-olpc-mesh.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c index f73108a793..546ecfafe4 100644 --- a/src/nm-device-olpc-mesh.c +++ b/src/nm-device-olpc-mesh.c @@ -637,15 +637,6 @@ real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason) return NM_ACT_STAGE_RETURN_SUCCESS; } -static NMActStageReturn -real_act_stage4_ip4_config_timeout (NMDevice *dev, - NMIP4Config **config, - NMDeviceStateReason *reason) -{ - return NM_ACT_STAGE_RETURN_FAILURE; -} - - static void dispose (GObject *object) { @@ -734,7 +725,6 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass) parent_class->act_stage1_prepare = real_act_stage1_prepare; parent_class->act_stage2_config = real_act_stage2_config; - parent_class->act_stage4_ip4_config_timeout = real_act_stage4_ip4_config_timeout; /* Properties */ g_object_class_install_property