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 <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2021-04-23 09:53:12 +03:00 committed by Jukka Rissanen
commit 698d12f4d2

View file

@ -97,17 +97,16 @@ struct net_pkt {
struct net_if *orig_iface; /* Original network interface */ struct net_if *orig_iface; /* Original network interface */
#endif #endif
#if defined(CONFIG_NET_PKT_TIMESTAMP) || \ #if defined(CONFIG_NET_PKT_TIMESTAMP)
defined(CONFIG_NET_PKT_RXTIME_STATS) || \
defined(CONFIG_NET_PKT_TXTIME_STATS)
struct {
/** Timestamp if available. */ /** Timestamp if available. */
struct net_ptp_time timestamp; struct net_ptp_time timestamp;
#endif
#if defined(CONFIG_NET_PKT_RXTIME_STATS) || defined(CONFIG_NET_PKT_TXTIME_STATS) #if defined(CONFIG_NET_PKT_RXTIME_STATS) || defined(CONFIG_NET_PKT_TXTIME_STATS)
struct {
/** Create time in cycles */ /** Create time in cycles */
uint32_t create_time; uint32_t create_time;
#endif
#if defined(CONFIG_NET_PKT_TXTIME_STATS_DETAIL) || \ #if defined(CONFIG_NET_PKT_TXTIME_STATS_DETAIL) || \
defined(CONFIG_NET_PKT_RXTIME_STATS_DETAIL) defined(CONFIG_NET_PKT_RXTIME_STATS_DETAIL)
/** Collect extra statistics for net_pkt processing /** Collect extra statistics for net_pkt processing
@ -122,7 +121,7 @@ struct net_pkt {
#endif /* CONFIG_NET_PKT_TXTIME_STATS_DETAIL || #endif /* CONFIG_NET_PKT_TXTIME_STATS_DETAIL ||
CONFIG_NET_PKT_RXTIME_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) #if defined(CONFIG_NET_PKT_TXTIME)
/** Network packet TX time in the future (in nanoseconds) */ /** Network packet TX time in the future (in nanoseconds) */