From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 9 Jan 2018 13:01:05 +0000 (+0100)
Subject: Merge pull request #7191 from Mic92/systemd
X-Git-Tag: v237~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2269954112e4a61b1a66a4771070b37c8a81a748;p=thirdparty%2Fsystemd.git

Merge pull request #7191 from Mic92/systemd

The change in netdev.c done in the merge is necessary to avoid crashing in
cleanup. This is a follow-up for f3c33b234d9f0256805722f02c7b4c4b59fd6de6.
---

2269954112e4a61b1a66a4771070b37c8a81a748
diff --cc src/network/netdev/netdev.c
index 0bfe49006b9,d609b0fb725..199e9111286
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@@ -111,10 -114,10 +114,10 @@@ static void netdev_cancel_callbacks(Net
          _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
          netdev_join_callback *callback;
  
--        if (!netdev)
++        if (!netdev || !netdev->manager)
                  return;
  
-         rtnl_message_new_synthetic_error(-ENODEV, 0, &m);
+         rtnl_message_new_synthetic_error(netdev->manager->rtnl, -ENODEV, 0, &m);
  
          while ((callback = netdev->callbacks)) {
                  if (m) {