From 14ae46021b7c130f856499f21725c7297697b230 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 12 Sep 2016 12:35:21 +0200 Subject: [PATCH] device: drop NMDeviceMacvlan:bring_up() implementation This was added by commit 4de8851eca06d797f1a3c89f5710d51018ca2bff, probably by copying from NMDeviceVlan. It's not clear why a netlink request to set the device IFF_UP would fail, or why that warrants a retry. --- src/devices/nm-device-macvlan.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index 2bfc65cb2d..e9841a9d9c 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -267,20 +267,6 @@ get_generic_capabilities (NMDevice *dev) return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_IS_SOFTWARE; } -static gboolean -bring_up (NMDevice *dev, gboolean *no_firmware) -{ - gboolean success = FALSE; - guint i = 20; - - while (i-- > 0 && !success) { - success = NM_DEVICE_CLASS (nm_device_macvlan_parent_class)->bring_up (dev, no_firmware); - g_usleep (50); - } - - return success; -} - /******************************************************************/ static gboolean @@ -616,7 +602,6 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass) object_class->set_property = set_property; device_class->act_stage1_prepare = act_stage1_prepare; - device_class->bring_up = bring_up; device_class->check_connection_compatible = check_connection_compatible; device_class->complete_connection = complete_connection; device_class->connection_type = NM_SETTING_MACVLAN_SETTING_NAME;