summaryrefslogtreecommitdiff
path: root/src/network/networkd-link.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-06-02 17:45:08 +0200
committerLennart Poettering <lennart@poettering.net>2016-06-06 19:59:07 +0200
commitfc6a313b5b836a8642a47348272d7883e1b9349d (patch)
tree45de1fba29d09750b420789735adcc8f97b8f188 /src/network/networkd-link.c
parent5f94b4e62e9439b3580653e30082981e33128b8a (diff)
lldp: add proper ref counting to sd_lldp object and a separate call for setting the ifindex
Let's make sd-lldp a bit more like sd-ndisc ant the other APIs, and add proper ref counting and a separate call for setting the ifindex. This also adds a new lldp_reset() call we can use at various places to close all fds. This is also similar to how sd-ndisc already does it.
Diffstat (limited to 'src/network/networkd-link.c')
-rw-r--r--src/network/networkd-link.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index ee52b1ce1e..90ed55d42c 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2364,7 +2364,11 @@ static int link_configure(Link *link) {
}
if (link_lldp_rx_enabled(link)) {
- r = sd_lldp_new(&link->lldp, link->ifindex);
+ r = sd_lldp_new(&link->lldp);
+ if (r < 0)
+ return r;
+
+ r = sd_lldp_set_ifindex(link->lldp, link->ifindex);
if (r < 0)
return r;