Merge pull request #17334 from cscarpitta/fix/fix-wrong-srv6-debug-macros

zebra: Fix incorrect debug macros
This commit is contained in:
Donald Sharp 2024-11-03 17:53:05 -05:00 committed by GitHub
commit 747d116b65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1159,7 +1159,7 @@ static bool alloc_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block,
format = block->sid_format; 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", zlog_debug("%s: trying to allocate explicit SID function %u from block %pFX",
__func__, sid_func, &block->prefix); __func__, sid_func, &block->prefix);
@ -1305,7 +1305,7 @@ static bool alloc_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block,
block->u.uncompressed.num_func_allocated++; 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", zlog_debug("%s: allocated explicit SID function %u from block %pFX",
__func__, sid_func, &block->prefix); __func__, sid_func, &block->prefix);
@ -1331,7 +1331,7 @@ static bool alloc_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block,
format = block->sid_format; 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", zlog_debug("%s: trying to allocate dynamic SID function from block %pFX",
__func__, &block->prefix); __func__, &block->prefix);
@ -1465,7 +1465,7 @@ static bool alloc_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block,
block->u.uncompressed.num_func_allocated++; 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", zlog_debug("%s: allocated dynamic SID function %u from block %pFX",
__func__, *sid_func, &block->prefix); __func__, *sid_func, &block->prefix);
@ -1794,7 +1794,7 @@ static bool release_srv6_sid_func_explicit(struct zebra_srv6_sid_block *block,
format = block->sid_format; 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", zlog_debug("%s: trying to release explicit SRv6 SID function %u from block %pFX",
__func__, sid_func, &block->prefix); __func__, sid_func, &block->prefix);
@ -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); 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", zlog_debug("%s: released explicit SRv6 SID function %u from block %pFX",
__func__, sid_func, &block->prefix); __func__, sid_func, &block->prefix);
@ -1944,7 +1944,7 @@ static int release_srv6_sid_func_dynamic(struct zebra_srv6_sid_block *block,
format = block->sid_format; 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", zlog_debug("%s: trying to release dynamic SRv6 SID function %u from block %pFX",
__func__, sid_func, &block->prefix); __func__, sid_func, &block->prefix);
@ -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", zlog_debug("%s: released dynamic SRv6 SID function %u from block %pFX",
__func__, sid_func, &block->prefix); __func__, sid_func, &block->prefix);