From 698d12f4d2a6ead3dcf67b8f27e2f50ff38e5127 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Fri, 23 Apr 2021 09:53:12 +0300 Subject: [PATCH] net: pkt: Separate the timestamp and TX/RX stats configs The timestamp is no longer depending on TX/RX time config options so move it to separate settings. Signed-off-by: Jukka Rissanen --- include/net/net_pkt.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/include/net/net_pkt.h b/include/net/net_pkt.h index e3d2a65e02b..d25d9d1c62a 100644 --- a/include/net/net_pkt.h +++ b/include/net/net_pkt.h @@ -97,17 +97,16 @@ struct net_pkt { struct net_if *orig_iface; /* Original network interface */ #endif -#if defined(CONFIG_NET_PKT_TIMESTAMP) || \ - defined(CONFIG_NET_PKT_RXTIME_STATS) || \ - defined(CONFIG_NET_PKT_TXTIME_STATS) - struct { - /** Timestamp if available. */ - struct net_ptp_time timestamp; +#if defined(CONFIG_NET_PKT_TIMESTAMP) + /** Timestamp if available. */ + struct net_ptp_time timestamp; +#endif #if defined(CONFIG_NET_PKT_RXTIME_STATS) || defined(CONFIG_NET_PKT_TXTIME_STATS) + struct { /** Create time in cycles */ uint32_t create_time; -#endif + #if defined(CONFIG_NET_PKT_TXTIME_STATS_DETAIL) || \ defined(CONFIG_NET_PKT_RXTIME_STATS_DETAIL) /** Collect extra statistics for net_pkt processing @@ -122,7 +121,7 @@ struct net_pkt { #endif /* CONFIG_NET_PKT_TXTIME_STATS_DETAIL || CONFIG_NET_PKT_RXTIME_STATS_DETAIL */ }; -#endif /* CONFIG_NET_PKT_TIMESTAMP */ +#endif /* CONFIG_NET_PKT_RXTIME_STATS || CONFIG_NET_PKT_TXTIME_STATS */ #if defined(CONFIG_NET_PKT_TXTIME) /** Network packet TX time in the future (in nanoseconds) */