summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-12-11 12:14:34 +0100
committerThomas Haller <thaller@redhat.com>2018-12-11 12:43:39 +0100
commit1bff602c460a483e817741fc7811bc6cfcb3ed64 (patch)
treeba81ba84b29224f82a710f361583c503cf8b2077
parentb7429d0a95eda7cada2bde7634ba0a7f31eeb18d (diff)
downloadNetworkManager-1bff602c460a483e817741fc7811bc6cfcb3ed64.tar.gz
device: fix matching device-spec for DHCP plugin
https://bugzilla.redhat.com/show_bug.cgi?id=1658057 Fixes: b9eb264efe6dec856d5e30f0c48a62017bad1466
-rw-r--r--src/devices/nm-device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 97b02d8620..97330b2e68 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -15950,8 +15950,8 @@ nm_device_spec_match_list_full (NMDevice *self, const GSList *specs, int no_matc
nm_device_get_driver (self),
nm_device_get_driver_version (self),
nm_device_get_permanent_hw_address (self),
- nm_dhcp_manager_get_config (nm_dhcp_manager_get ()),
- klass->get_s390_subchannels ? klass->get_s390_subchannels (self) : NULL);
+ klass->get_s390_subchannels ? klass->get_s390_subchannels (self) : NULL,
+ nm_dhcp_manager_get_config (nm_dhcp_manager_get ()));
switch (m) {
case NM_MATCH_SPEC_MATCH: