From b226d99b044222739dccfa9cf9f7a9d79576c407 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 8 May 2014 19:46:06 +0200 Subject: networkd: link - take refcounts on links We need to take a refcount on the link whenever we expect a callback. The exceptions are the ipv4ll/dhcp clients as their lifetimes are guaranteed to be shorter than that of the link. --- src/network/networkd-netdev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/network/networkd-netdev.c') diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 961404295..5ee257f98 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -168,7 +168,7 @@ static int netdev_enter_ready(NetDev *netdev) { log_info_netdev(netdev, "netdev ready"); LIST_FOREACH(callbacks, callback, netdev->callbacks) { - /* enslave the links that were attempted to be enslaved befor the + /* enslave the links that were attempted to be enslaved before the * link was ready */ netdev_enslave_ready(netdev, callback->link, callback->callback); } @@ -308,11 +308,15 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c } int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { + int r; + if (netdev->kind == NETDEV_KIND_VLAN || netdev->kind == NETDEV_KIND_MACVLAN) return netdev_create(netdev, link, callback); if (netdev->state == NETDEV_STATE_READY) { - netdev_enslave_ready(netdev, link, callback); + r = netdev_enslave_ready(netdev, link, callback); + if (r < 0) + return r; } else { /* the netdev is not yet read, save this request for when it is*/ netdev_enslave_callback *cb; -- cgit v1.2.3