From 973c4750e1d1ea9bd05dfba2e27fe2d1dcc10a02 Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 3 Nov 2024 08:42:36 +0100 Subject: [PATCH 1/8] zebra: Fix wrong debug macro in `alloc_srv6_sid_func_explicit` `ZEBRA_DEBUG_SRV6` is not the correct macro to evaluate if SRv6 debug is enabled or not. The correct macro is `IS_ZEBRA_DEBUG_SRV6`. Fix this by replacing `ZEBRA_DEBUG_SRV6` with `IS_ZEBRA_DEBUG_SRV6`. Signed-off-by: Carmine Scarpitta --- zebra/zebra_srv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index e0df47bc2c..693ba62202 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -1159,7 +1159,7 @@ static bool alloc_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block, format = block->sid_format; - if (ZEBRA_DEBUG_SRV6) + if (IS_ZEBRA_DEBUG_SRV6) zlog_debug("%s: trying to allocate explicit SID function %u from block %pFX", __func__, sid_func, &block->prefix); From 4710baa7bbf86fafade11816acdd43e435e848ba Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 3 Nov 2024 08:42:58 +0100 Subject: [PATCH 2/8] zebra: Fix wrong debug macro in `alloc_srv6_sid_func_dynamic` `ZEBRA_DEBUG_SRV6` is not the correct macro to evaluate if SRv6 debug is enabled or not. The correct macro is `IS_ZEBRA_DEBUG_SRV6`. Fix this by replacing `ZEBRA_DEBUG_SRV6` with `IS_ZEBRA_DEBUG_SRV6`. Signed-off-by: Carmine Scarpitta --- zebra/zebra_srv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index 693ba62202..c23bf46494 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -1331,7 +1331,7 @@ static bool alloc_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block, format = block->sid_format; - if (ZEBRA_DEBUG_SRV6) + if (IS_ZEBRA_DEBUG_SRV6) zlog_debug("%s: trying to allocate dynamic SID function from block %pFX", __func__, &block->prefix); From 8e96fcece22fc6e5e505c4446adf3ce0318c1c02 Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 3 Nov 2024 08:43:17 +0100 Subject: [PATCH 3/8] zebra: Fix wrong debug macro in `release_srv6_sid_func_explicit` `ZEBRA_DEBUG_SRV6` is not the correct macro to evaluate if SRv6 debug is enabled or not. The correct macro is `IS_ZEBRA_DEBUG_SRV6`. Fix this by replacing `ZEBRA_DEBUG_SRV6` with `IS_ZEBRA_DEBUG_SRV6`. Signed-off-by: Carmine Scarpitta --- zebra/zebra_srv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index c23bf46494..d554731603 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -1794,7 +1794,7 @@ static bool release_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block, format = block->sid_format; - if (ZEBRA_DEBUG_SRV6) + if (IS_ZEBRA_DEBUG_SRV6) zlog_debug("%s: trying to release explicit SRv6 SID function %u from block %pFX", __func__, sid_func, &block->prefix); From a56e790b07409e4bf15f1e8cac7274b42c31f034 Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 3 Nov 2024 08:43:38 +0100 Subject: [PATCH 4/8] zebra: Fix wrong debug macro in `release_srv6_sid_func_dynamic` `ZEBRA_DEBUG_SRV6` is not the correct macro to evaluate if SRv6 debug is enabled or not. The correct macro is `IS_ZEBRA_DEBUG_SRV6`. Fix this by replacing `ZEBRA_DEBUG_SRV6` with `IS_ZEBRA_DEBUG_SRV6`. Signed-off-by: Carmine Scarpitta --- zebra/zebra_srv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index d554731603..152c1d3dd1 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -1944,7 +1944,7 @@ static int release_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block, format = block->sid_format; - if (ZEBRA_DEBUG_SRV6) + if (IS_ZEBRA_DEBUG_SRV6) zlog_debug("%s: trying to release dynamic SRv6 SID function %u from block %pFX", __func__, sid_func, &block->prefix); From 58fd136f44274d8956a43c6d23ba81ab6f3bbf50 Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 3 Nov 2024 08:43:55 +0100 Subject: [PATCH 5/8] zebra: Fix wrong debug macro in `alloc_srv6_sid_func_explicit` `ZEBRA_DEBUG_SRV6` is not the correct macro to evaluate if SRv6 debug is enabled or not. The correct macro is `IS_ZEBRA_DEBUG_SRV6`. Fix this by replacing `ZEBRA_DEBUG_SRV6` with `IS_ZEBRA_DEBUG_SRV6`. Signed-off-by: Carmine Scarpitta --- zebra/zebra_srv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index 152c1d3dd1..56536db866 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -1305,7 +1305,7 @@ static bool alloc_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block, block->u.uncompressed.num_func_allocated++; } - if (ZEBRA_DEBUG_SRV6) + if (IS_ZEBRA_DEBUG_SRV6) zlog_debug("%s: allocated explicit SID function %u from block %pFX", __func__, sid_func, &block->prefix); From d1810d5c7f940b88063cffcb8477271190447b8f Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 3 Nov 2024 08:44:23 +0100 Subject: [PATCH 6/8] zebra: Fix wrong debug macro in `alloc_srv6_sid_func_dynamic` `ZEBRA_DEBUG_SRV6` is not the correct macro to evaluate if SRv6 debug is enabled or not. The correct macro is `IS_ZEBRA_DEBUG_SRV6`. Fix this by replacing `ZEBRA_DEBUG_SRV6` with `IS_ZEBRA_DEBUG_SRV6`. Signed-off-by: Carmine Scarpitta --- zebra/zebra_srv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index 56536db866..b87501b755 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -1465,7 +1465,7 @@ static bool alloc_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block, block->u.uncompressed.num_func_allocated++; } - if (ZEBRA_DEBUG_SRV6) + if (IS_ZEBRA_DEBUG_SRV6) zlog_debug("%s: allocated dynamic SID function %u from block %pFX", __func__, *sid_func, &block->prefix); From 69b1acf4e308b102fb7131235d86673b52fd660c Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 3 Nov 2024 08:44:41 +0100 Subject: [PATCH 7/8] zebra: Fix wrong debug macro in `release_srv6_sid_func_explicit` `ZEBRA_DEBUG_SRV6` is not the correct macro to evaluate if SRv6 debug is enabled or not. The correct macro is `IS_ZEBRA_DEBUG_SRV6`. Fix this by replacing `ZEBRA_DEBUG_SRV6` with `IS_ZEBRA_DEBUG_SRV6`. Signed-off-by: Carmine Scarpitta --- zebra/zebra_srv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index b87501b755..86ff81c4be 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -1918,7 +1918,7 @@ static bool release_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block, zebra_srv6_sid_func_free(sid_func_ptr); } - if (ZEBRA_DEBUG_SRV6) + if (IS_ZEBRA_DEBUG_SRV6) zlog_debug("%s: released explicit SRv6 SID function %u from block %pFX", __func__, sid_func, &block->prefix); From afd9d3f924133ec4ae54014a1f44467946a71466 Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 3 Nov 2024 08:45:03 +0100 Subject: [PATCH 8/8] zebra: Fix wrong debug macro in `release_srv6_sid_func_dynamic` `ZEBRA_DEBUG_SRV6` is not the correct macro to evaluate if SRv6 debug is enabled or not. The correct macro is `IS_ZEBRA_DEBUG_SRV6`. Fix this by replacing `ZEBRA_DEBUG_SRV6` with `IS_ZEBRA_DEBUG_SRV6`. Signed-off-by: Carmine Scarpitta --- zebra/zebra_srv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index 86ff81c4be..624f60e815 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -2107,7 +2107,7 @@ static int release_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block, } } - if (ZEBRA_DEBUG_SRV6) + if (IS_ZEBRA_DEBUG_SRV6) zlog_debug("%s: released dynamic SRv6 SID function %u from block %pFX", __func__, sid_func, &block->prefix);