From 3bd8dd4aa23feefd6f33a28241e3c2d78981c006 Mon Sep 17 00:00:00 2001 From: Akshai M Date: Fri, 22 May 2020 23:08:05 +0530 Subject: [PATCH] gnrc/lwmac : Move GNRC_LWMAC_BROADCAST_CSMA_RETRIES to 'CONFIG_' --- sys/include/net/gnrc/lwmac/lwmac.h | 4 ++-- sys/net/gnrc/link_layer/lwmac/tx_state_machine.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/include/net/gnrc/lwmac/lwmac.h b/sys/include/net/gnrc/lwmac/lwmac.h index 01f19b210d..7a55090ce6 100644 --- a/sys/include/net/gnrc/lwmac/lwmac.h +++ b/sys/include/net/gnrc/lwmac/lwmac.h @@ -311,8 +311,8 @@ extern "C" { * @note Too many CSMA retries may lead to running out of destinations * wake-up period. */ -#ifndef GNRC_LWMAC_BROADCAST_CSMA_RETRIES -#define GNRC_LWMAC_BROADCAST_CSMA_RETRIES (3U) +#ifndef CONFIG_GNRC_LWMAC_BROADCAST_CSMA_RETRIES +#define CONFIG_GNRC_LWMAC_BROADCAST_CSMA_RETRIES (3U) #endif /** @} */ diff --git a/sys/net/gnrc/link_layer/lwmac/tx_state_machine.c b/sys/net/gnrc/link_layer/lwmac/tx_state_machine.c index 3bd85aa389..3a3dbacf27 100644 --- a/sys/net/gnrc/link_layer/lwmac/tx_state_machine.c +++ b/sys/net/gnrc/link_layer/lwmac/tx_state_machine.c @@ -557,7 +557,7 @@ static bool _lwmac_tx_update(gnrc_netif_t *netif) if (gnrc_netif_hdr_get_flag(netif->mac.tx.packet) & (GNRC_NETIF_HDR_FLAGS_BROADCAST | GNRC_NETIF_HDR_FLAGS_MULTICAST)) { /* Set CSMA retries as configured and enable */ - uint8_t csma_retries = GNRC_LWMAC_BROADCAST_CSMA_RETRIES; + uint8_t csma_retries = CONFIG_GNRC_LWMAC_BROADCAST_CSMA_RETRIES; netif->dev->driver->set(netif->dev, NETOPT_CSMA_RETRIES, &csma_retries, sizeof(csma_retries)); netif->mac.mac_info |= GNRC_NETIF_MAC_INFO_CSMA_ENABLED;