diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-10-22 20:59:35 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-12-11 09:38:45 -0600 |
| commit | fe1e0c81cd8d4ae3cb2fbcaf411f5ed6ce3df005 (patch) | |
| tree | 21e998f244769dbe6452f4ffd0b7e43fc7b6e831 | |
| parent | bcd20270dc5d7014c0fe7df81b55445c43b096e6 (diff) | |
| download | NetworkManager-fe1e0c81cd8d4ae3cb2fbcaf411f5ed6ce3df005.tar.gz | |
fixup! platform: return link objects from add functions
| -rw-r--r-- | src/platform/nm-fake-platform.c | 2 | ||||
| -rw-r--r-- | src/platform/nm-linux-platform.c | 4 | ||||
| -rw-r--r-- | src/platform/nm-platform.c | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 9bfad4a8de..32ce620e23 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -169,7 +169,7 @@ _nm_platform_link_get (NMPlatform *platform, int ifindex, NMPlatformLink *l) { NMFakePlatformLink *device = link_get (platform, ifindex); - if (device) + if (device && l) *l = device->link; return !!device; } diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index b40aa5a336..96ab96390b 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -2226,7 +2226,9 @@ _nm_platform_link_get (NMPlatform *platform, int ifindex, NMPlatformLink *l) rtnllink = rtnl_link_get (priv->link_cache, ifindex); if (rtnllink) { if (link_is_announceable (platform, rtnllink)) { - if (init_link (platform, l, rtnllink)) + NMPlatformLink tmp = { 0 }; + + if (init_link (platform, l ? l : &tmp, rtnllink)) return TRUE; } } diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 592133a56e..efbb149233 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -472,7 +472,6 @@ gboolean nm_platform_link_get (int ifindex, NMPlatformLink *link) { g_return_val_if_fail (ifindex > 0, FALSE); - g_return_val_if_fail (link, FALSE); g_return_val_if_fail (klass->link_get, FALSE); return !!klass->link_get (platform, ifindex, link); |