This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push: new 2e1c522a79 stm32h7\stm32_fdcan_sock: reserve space for timeval struct in the intermediate storage of tx and rx CAN frames when timestamp is enabled 2e1c522a79 is described below commit 2e1c522a79fb27432ba6e58fa0b89b110c28012f Author: Rajvinder Kaur <rajvinderv...@hotmail.com> AuthorDate: Mon Sep 26 14:06:58 2022 -0400 stm32h7\stm32_fdcan_sock: reserve space for timeval struct in the intermediate storage of tx and rx CAN frames when timestamp is enabled --- arch/arm/src/stm32h7/stm32_fdcan_sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/stm32h7/stm32_fdcan_sock.c b/arch/arm/src/stm32h7/stm32_fdcan_sock.c index dfcd5e0093..35fafe3999 100644 --- a/arch/arm/src/stm32h7/stm32_fdcan_sock.c +++ b/arch/arm/src/stm32h7/stm32_fdcan_sock.c @@ -43,7 +43,7 @@ #include <nuttx/net/can.h> #include <netpacket/can.h> -#ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE +#if defined(CONFIG_NET_CAN_RAW_TX_DEADLINE) || defined(CONFIG_NET_TIMESTAMP) #include <sys/time.h> #endif @@ -112,7 +112,7 @@ #define POOL_SIZE 1 -#ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE +#if defined(CONFIG_NET_CAN_RAW_TX_DEADLINE) || defined(CONFIG_NET_TIMESTAMP) #define MSG_DATA sizeof(struct timeval) #else #define MSG_DATA 0