Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23c4ec10 authored by André Gaul's avatar André Gaul Committed by Antonio Quartulli
Browse files

batman-adv: remove unnecessary logspam 



This patch removes unnecessary logspam which resulted from superfluous
calls to net_ratelimit(). With the supplied patch, net_ratelimit() is
called after the loglevel has been checked.

Signed-off-by: default avatarAndré Gaul <gaul@web-yard.de>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <antonio@meshcoding.com>
parent 0185dda6

net/batman-adv/main.h

+14 −6
Original line number Diff line number Diff line
@@ -238,21 +238,29 @@ enum batadv_dbg_level { 
int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)

__printf(2, 3);



#define batadv_dbg(type, bat_priv, fmt, arg...)			\

/* possibly ratelimited debug output */

#define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...)	\

	do {							\

		if (atomic_read(&bat_priv->log_level) & type)	\

		if (atomic_read(&bat_priv->log_level) & type && \

		    (!ratelimited || net_ratelimit()))		\

			batadv_debug_log(bat_priv, fmt, ## arg);\

	}							\

	while (0)

#else /* !CONFIG_BATMAN_ADV_DEBUG */

__printf(3, 4)

static inline void batadv_dbg(int type __always_unused,

__printf(4, 5)

static inline void _batadv_dbg(int type __always_unused,

			       struct batadv_priv *bat_priv __always_unused,

			       int ratelimited __always_unused,

			       const char *fmt __always_unused, ...)

{

}

#endif



#define batadv_dbg(type, bat_priv, arg...) \

	_batadv_dbg(type, bat_priv, 0, ## arg)

#define batadv_dbg_ratelimited(type, bat_priv, arg...) \

	_batadv_dbg(type, bat_priv, 1, ## arg)



#define batadv_info(net_dev, fmt, arg...)				\

	do {								\

		struct net_device *_netdev = (net_dev);                 \

net/batman-adv/routing.c

+9 −9
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, 
	if (batadv_tt_local_client_is_roaming(bat_priv, ethhdr->h_dest, vid)) {

		if (batadv_reroute_unicast_packet(bat_priv, unicast_packet,

						  ethhdr->h_dest, vid))

			net_ratelimited_function(batadv_dbg, BATADV_DBG_TT,

			batadv_dbg_ratelimited(BATADV_DBG_TT,

					       bat_priv,

					       "Rerouting unicast packet to %pM (dst=%pM): Local Roaming\n",

					       unicast_packet->dest,
@@ -752,7 +752,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, 
	 */

	if (batadv_reroute_unicast_packet(bat_priv, unicast_packet,

					  ethhdr->h_dest, vid)) {

		net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv,

		batadv_dbg_ratelimited(BATADV_DBG_TT, bat_priv,

				       "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n",

				       unicast_packet->dest, ethhdr->h_dest,

				       old_ttvn, curr_ttvn);