The following commit has been merged in the batadv/net-next branch: commit ab23c7fbf2ae16741778f8e84c87e314c85f32be Author: Sven Eckelmann sven@narfation.org Date: Sun Feb 2 10:29:23 2025 +0100
batman-adv: Drop batadv_priv_debug_log struct
The support for the batman-adv ring buffer for debug logs was dropped with the removal of the debugfs filesystem. The structure storing this ring buffer is therefore no longer needed since commit aff6f5a68b92 ("batman-adv: Drop deprecated debugfs support")
Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index f491bff8c51b8..7800a3403e829 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1140,29 +1140,6 @@ struct batadv_priv_bla { }; #endif
-#ifdef CONFIG_BATMAN_ADV_DEBUG - -/** - * struct batadv_priv_debug_log - debug logging data - */ -struct batadv_priv_debug_log { - /** @log_buff: buffer holding the logs (ring buffer) */ - char log_buff[BATADV_LOG_BUF_LEN]; - - /** @log_start: index of next character to read */ - unsigned long log_start; - - /** @log_end: index of next character to write */ - unsigned long log_end; - - /** @lock: lock protecting log_buff, log_start & log_end */ - spinlock_t lock; - - /** @queue_wait: log reader's wait queue */ - wait_queue_head_t queue_wait; -}; -#endif - /** * struct batadv_priv_gw - per mesh interface gateway data */ @@ -1776,11 +1753,6 @@ struct batadv_priv { struct batadv_priv_bla bla; #endif
-#ifdef CONFIG_BATMAN_ADV_DEBUG - /** @debug_log: holding debug logging relevant data */ - struct batadv_priv_debug_log *debug_log; -#endif - /** @gw: gateway data */ struct batadv_priv_gw gw;