From: Mohsin Kazmi <sykazmi@cisco.com>
Date: Wed, 22 Sep 2021 20:03:28 +0000 (+0000)
Subject: tap: move the api msg_id_base to tap_main_t
X-Git-Tag: v22.06-rc0~509
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=b21fd4b7e09455f199495e7160d5537195e36046;p=vpp.git

tap: move the api msg_id_base to tap_main_t

Type: fix

Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
Change-Id: Ia4065550a7ad1109e3a2592ef2c21b5e23fa85b5
---

diff --git a/src/vnet/devices/tap/tap.h b/src/vnet/devices/tap/tap.h
index 2efaa511a49..d89809862c0 100644
--- a/src/vnet/devices/tap/tap.h
+++ b/src/vnet/devices/tap/tap.h
@@ -98,8 +98,10 @@ typedef struct
 
   /* host mtu size, configurable through startup.conf */
   int host_mtu_size;
+  u16 msg_id_base;
 } tap_main_t;
 
+extern tap_main_t tap_main;
 void tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args);
 int tap_delete_if (vlib_main_t * vm, u32 sw_if_index);
 int tap_gso_enable_disable (vlib_main_t * vm, u32 sw_if_index,
diff --git a/src/vnet/devices/tap/tapv2_api.c b/src/vnet/devices/tap/tapv2_api.c
index 08dca0dc92b..64a0088136b 100644
--- a/src/vnet/devices/tap/tapv2_api.c
+++ b/src/vnet/devices/tap/tapv2_api.c
@@ -32,11 +32,9 @@
 #include <vnet/devices/tap/tapv2.api_enum.h>
 #include <vnet/devices/tap/tapv2.api_types.h>
 
-#define REPLY_MSG_ID_BASE msg_id_base
+#define REPLY_MSG_ID_BASE tap_main.msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-static u16 msg_id_base;
-
 static void
 vl_api_tap_create_v2_t_handler (vl_api_tap_create_v2_t * mp)
 {