*: auto-convert to SPDX License IDs

[mirror_frr.git] / zebra / kernel_netlink.c

diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index 54d9561e2b58c15739e6beda093483132164c0df..bac75a641b107d81b54a68505fa0017a4ad2a420 100644 (file)
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Kernel communication using netlink interface.
  * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -202,13 +187,13 @@ struct nl_batch {
 
        const struct zebra_dplane_info *zns;
 
-       struct dplane_ctx_q ctx_list;
+       struct dplane_ctx_list_head ctx_list;
 
        /*
         * Pointer to the queue of completed contexts outbound back
         * towards the dataplane module.
         */
-       struct dplane_ctx_q *ctx_out_q;
+       struct dplane_ctx_list_head *ctx_out_q;
 };
 
 int netlink_config_write_helper(struct vty *vty)
@@ -1446,10 +1431,11 @@ static void nl_batch_reset(struct nl_batch *bth)
        bth->msgcnt = 0;
        bth->zns = NULL;
 
-       TAILQ_INIT(&(bth->ctx_list));
+       dplane_ctx_q_init(&(bth->ctx_list));
 }
 
-static void nl_batch_init(struct nl_batch *bth, struct dplane_ctx_q *ctx_out_q)
+static void nl_batch_init(struct nl_batch *bth,
+                         struct dplane_ctx_list_head *ctx_out_q)
 {
        /*
         * If the size of the buffer has changed, free and then allocate a new
@@ -1665,14 +1651,14 @@ static enum netlink_msg_status nl_put_msg(struct nl_batch *bth,
        return FRR_NETLINK_ERROR;
 }
 
-void kernel_update_multi(struct dplane_ctx_q *ctx_list)
+void kernel_update_multi(struct dplane_ctx_list_head *ctx_list)
 {
        struct nl_batch batch;
        struct zebra_dplane_ctx *ctx;
-       struct dplane_ctx_q handled_list;
+       struct dplane_ctx_list_head handled_list;
        enum netlink_msg_status res;
 
-       TAILQ_INIT(&handled_list);
+       dplane_ctx_q_init(&handled_list);
        nl_batch_init(&batch, &handled_list);
 
        while (true) {
@@ -1703,7 +1689,7 @@ void kernel_update_multi(struct dplane_ctx_q *ctx_list)
 
        nl_batch_send(&batch);
 
-       TAILQ_INIT(ctx_list);
+       dplane_ctx_q_init(ctx_list);
        dplane_ctx_list_append(ctx_list, &handled_list);
 }