diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2012-11-02 15:16:37 +0100 |
|---|---|---|
| committer | Pavel Šimerda <psimerda@redhat.com> | 2013-08-29 19:58:47 +0200 |
| commit | a6919943688d8ec4104cbb1d7cba68c2e106cf5e (patch) | |
| tree | 7a4b9e0e421366542e8e566d4a34e3ec07836cd6 | |
| parent | d622deb1dd19b30f76a17e6ac22b2874ced97c29 (diff) | |
| download | NetworkManager-a6919943688d8ec4104cbb1d7cba68c2e106cf5e.tar.gz | |
bridging/bonding: enslave wifi connections/devices
| -rw-r--r-- | src/devices/nm-device-wifi.c | 3 | ||||
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/reader.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/devices/nm-device-wifi.c b/src/devices/nm-device-wifi.c index cffc2c2939..add88ac9c7 100644 --- a/src/devices/nm-device-wifi.c +++ b/src/devices/nm-device-wifi.c @@ -2925,7 +2925,8 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) done: set_active_ap (self, ap); - return NM_ACT_STAGE_RETURN_SUCCESS; + + return NM_DEVICE_CLASS (nm_device_wifi_parent_class)->act_stage1_prepare (dev, reason); } static void diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 211e199090..7f7aaf4607 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -3302,6 +3302,7 @@ wireless_connection_from_ifcfg (const char *file, g_object_unref (connection); return NULL; } + check_if_bond_slave (ifcfg, NM_SETTING_CONNECTION (con_setting)); nm_connection_add_setting (connection, con_setting); /* Don't verify if unmanaged since we may not have an SSID or whatever */ |