From aa3437a573ed2a2b2a03c9649fe11d27b40a772b Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Fri, 3 Jan 2014 18:20:11 +0100
Subject: networkd: print the ifindex of added links

This debug information may be useful when comapring to dropped rtnetlink messages.
---
 src/network/networkd-link.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/network/networkd-link.c')

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 889efc8c2f..bc8ca21c82 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -89,7 +89,7 @@ void link_free(Link *link) {
         free(link);
 }
 
-int link_add(Manager *m, struct udev_device *device) {
+int link_add(Manager *m, struct udev_device *device, Link **ret) {
         Link *link;
         Network *network;
         int r;
@@ -101,18 +101,22 @@ int link_add(Manager *m, struct udev_device *device) {
 
         ifindex = udev_device_get_ifindex(device);
         link = hashmap_get(m->links, &ifindex);
-        if (link)
+        if (link) {
+                *ret = link;
                 return -EEXIST;
+        }
 
         r = link_new(m, device, &link);
         if (r < 0)
                 return r;
 
+        *ret = link;
+
         devtype = udev_device_get_devtype(device);
         if (streq_ptr(devtype, "bridge")) {
                 r = bridge_set_link(m, link);
-                if (r < 0)
-                        return r == -ENOENT ? 0 : r;
+                if (r < 0 && r != -ENOENT)
+                        return r;
         }
 
         r = network_get(m, device, &network);
-- 
cgit v1.2.3-54-g00ecf