]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: adjust assertions 22626/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 26 Feb 2022 03:01:41 +0000 (12:01 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 26 Feb 2022 06:01:50 +0000 (15:01 +0900)
src/network/networkd-bridge-mdb.c
src/network/networkd-nexthop.c

index bf9e49ae3900b0b5d44d032439c2caa1137df6ac..af01a89f47bae5f0f946c06e8fce75d04112dd38 100644 (file)
@@ -121,7 +121,6 @@ static int bridge_mdb_configure(BridgeMDB *mdb, Link *link, link_netlink_message
 
         assert(mdb);
         assert(link);
-        assert(link->network);
         assert(link->manager);
         assert(callback);
 
index 07596821d07791924e0c01fe59f88357534548be..8f555d96852f2e34a4bc3693981411a374a64ce3 100644 (file)
@@ -433,11 +433,12 @@ static int nexthop_configure(
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
 
+        assert(nexthop);
+        assert(IN_SET(nexthop->family, AF_UNSPEC, AF_INET, AF_INET6));
         assert(link);
         assert(link->manager);
         assert(link->manager->rtnl);
         assert(link->ifindex > 0);
-        assert(IN_SET(nexthop->family, AF_UNSPEC, AF_INET, AF_INET6));
         assert(callback);
 
         log_nexthop_debug(nexthop, "Configuring", link);