diff options
| author | Dan Winship <danw@gnome.org> | 2014-09-24 13:15:42 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-09-30 11:07:25 -0400 |
| commit | 94c3f1f70fc071775290f343051d1c0a98af3487 (patch) | |
| tree | 1296a27f2cab60da7eb6798e58ce0a2c955e0b96 | |
| parent | 687f31920145af8abe5a81b520b8080f895e29cf (diff) | |
| download | NetworkManager-94c3f1f70fc071775290f343051d1c0a98af3487.tar.gz | |
devices: fix default ethernet connection code
Creation of default wired connections got broken by an incomplete
rebase of dcbw/internal-device-factories after danw/libnm-props
landed.
https://bugzilla.gnome.org/show_bug.cgi?id=737273
| -rw-r--r-- | src/devices/nm-device-ethernet.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 92d0b3dc7d..d057f1bea8 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1473,7 +1473,6 @@ new_default_connection (NMDevice *self) NMSetting *setting; const char *hw_address; char *defname, *uuid; - GByteArray *mac; if (!nm_config_get_ethernet_can_auto_default (nm_config_get (), self)) return NULL; @@ -1501,12 +1500,9 @@ new_default_connection (NMDevice *self) /* Lock the connection to the device */ setting = nm_setting_wired_new (); + g_object_set (setting, NM_SETTING_WIRED_MAC_ADDRESS, hw_address, NULL); nm_connection_add_setting (connection, setting); - mac = nm_utils_hwaddr_atoba (hw_address, ETH_ALEN); - g_object_set (setting, NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL); - g_byte_array_unref (mac); - return connection; } |