colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into iscsi

Browse Source
This commit is contained in:
Dan Williams
2009-08-05 15:46:11 -04:00
parent f2eb3dea65 4bab33405b
commit 4802094985
33 changed files with 2296 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nm-device-ethernet.c
View File

@@ -1256,7 +1256,7 @@ ppp_ip4_config (NMPPPManager *ppp_manager,
nm_device_set_ip_iface (device, iface);
NM_DEVICE_ETHERNET_GET_PRIVATE (device)->pending_ip4_config = g_object_ref (config);
nm_device_activate_schedule_stage4_ip_config_get (device);
nm_device_activate_schedule_stage4_ip4_config_get (device);
}
static NMActStageReturn