zebra: Isolate mlag_rd_buf_offset to the actual using function

Isolate the mlag_rd_buf_offset variable to the actual used function,
instead of having it a global.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/zebra/zebra_mlag.c b/zebra/zebra_mlag.c
index fb8798ebd9857297eb702e4fdfcb11168d098688..d8ed9b2a3a4448a748dec5ec26c1fd2e6758097a 100644 (file)
--- a/zebra/zebra_mlag.c
+++ b/zebra/zebra_mlag.c
@@ -49,7 +49,6 @@ DEFINE_HOOK(zebra_mlag_private_cleanup_data, (), ())
 
 uint8_t mlag_wr_buffer[ZEBRA_MLAG_BUF_LIMIT];
 uint8_t mlag_rd_buffer[ZEBRA_MLAG_BUF_LIMIT];
-uint32_t mlag_rd_buf_offset;
 
 static bool test_mlag_in_progress;
 

diff --git a/zebra/zebra_mlag.h b/zebra/zebra_mlag.h
index 85028d277473bef962c8b7f7049aaa723c1807c5..b195c75ea3c1bcf183ed969671c89c55eb963ba2 100644 (file)
--- a/zebra/zebra_mlag.h
+++ b/zebra/zebra_mlag.h
@@ -42,12 +42,10 @@ DECLARE_HOOK(zebra_mlag_private_cleanup_data, (), ())
 
 extern uint8_t mlag_wr_buffer[ZEBRA_MLAG_BUF_LIMIT];
 extern uint8_t mlag_rd_buffer[ZEBRA_MLAG_BUF_LIMIT];
-extern uint32_t mlag_rd_buf_offset;
 
 static inline void zebra_mlag_reset_read_buffer(void)
 {
        memset(mlag_wr_buffer, 0, ZEBRA_MLAG_BUF_LIMIT);
-       mlag_rd_buf_offset = 0;
 }
 
 enum zebra_mlag_state {

diff --git a/zebra/zebra_mlag_private.c b/zebra/zebra_mlag_private.c
index d39b0c0aee8b78ac7f38043402489d966a0d35d5..8a66d6de726a99e90f810a56598c2b0f5d0ce358 100644 (file)
--- a/zebra/zebra_mlag_private.c
+++ b/zebra/zebra_mlag_private.c
@@ -74,6 +74,7 @@ static void zebra_mlag_sched_read(void)
 
 static int zebra_mlag_read(struct thread *thread)
 {
+       static uint32_t mlag_rd_buf_offset;
        uint32_t *msglen;
        uint32_t h_msglen;
        uint32_t tot_len, curr_len = mlag_rd_buf_offset;
@@ -159,6 +160,7 @@ static int zebra_mlag_read(struct thread *thread)
 
        /* Register read thread. */
        zebra_mlag_reset_read_buffer();
+       mlag_rd_buf_offset = 0;
        zebra_mlag_sched_read();
        return 0;
 }