The branch main has been updated by glebius:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=d521362f8f7e74178eeea1b7e333ca02a440f3e5

commit d521362f8f7e74178eeea1b7e333ca02a440f3e5
Author:     Gleb Smirnoff <gleb...@freebsd.org>
AuthorDate: 2025-01-20 21:38:02 +0000
Commit:     Gleb Smirnoff <gleb...@freebsd.org>
CommitDate: 2025-01-20 21:38:02 +0000

    netlink: fix build
    
    The commit checked in had a dependency on not yet reviewed changes.
    Revert them, but the main gist of the commit is not reverted.
    
    Fixes:  f2a4eed3e13b6aeb9ddeef580d3b931cf22a14e3
---
 sys/netlink/netlink_snl_generic.h | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/sys/netlink/netlink_snl_generic.h 
b/sys/netlink/netlink_snl_generic.h
index 7dc8980e1c5c..acf483ac0243 100644
--- a/sys/netlink/netlink_snl_generic.h
+++ b/sys/netlink/netlink_snl_generic.h
@@ -126,16 +126,10 @@ _snl_get_genl_family_info(struct snl_state *ss, const 
char *family_name,
 
        memset(attrs, 0, sizeof(*attrs));
 
-       if (__predict_false(!snl_init_writer(ss, &nw)))
-               return (false);
-       if (__predict_false(snl_create_genl_msg_request(&nw, GENL_ID_CTRL,
-           CTRL_CMD_GETFAMILY) == NULL))
-               return (false);
-       if (__predict_false(!snl_add_msg_attr_string(&nw,
-           CTRL_ATTR_FAMILY_NAME, family_name)))
-               return (false);
-       hdr = snl_finalize_msg(&nw);
-       if (!snl_send_message(ss, hdr))
+       snl_init_writer(ss, &nw);
+       snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY);
+       snl_add_msg_attr_string(&nw, CTRL_ATTR_FAMILY_NAME, family_name);
+       if ((hdr = snl_finalize_msg(&nw)) == NULL || !snl_send_message(ss, hdr))
                return (false);
 
        hdr = snl_read_reply(ss, hdr->nlmsg_seq);

Reply via email to