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.

diff --cc src/libsystemd/meson.build
Simple merge

diff --cc src/network/meson.build
Simple merge

diff --cc src/network/netdev/netdev.c
index 0bfe49006b90dba95c2ccea26aba8e1a4179d4dd,d609b0fb725ee8eae7dc43e00ca6651061b485aa..199e91112866bbfc1c23133ba8f966df2ee5be43
--- 1/src/network/netdev/netdev.c
--- 2/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) {

diff --cc src/network/netdev/netdev.h
Simple merge

diff --cc src/network/networkd-manager.c
Simple merge

diff --cc src/network/networkd-manager.h
Simple merge

diff --cc src/shared/meson.build
Simple merge