The following commit has been merged in the master branch: commit 611b975b5c868639b7cb0e89e22d1c8c561bf3a1 Author: Sven Eckelmann sven@narfation.org Date: Sat Jul 16 21:30:20 2016 +0200

batman-adv: Add BATADV_DBG_TP_METER to BATADV_DBG_ALL

The BATADV_DBG_ALL has to contain the bit of BATADV_DBG_TP_METER to really support all available debug messages.

Fixes: 33a3bb4a3345 ("batman-adv: throughput meter implementation") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index e0e1a88..d2905a8 100644 --- a/net/batman-adv/log.h +++ b/net/batman-adv/log.h @@ -63,7 +63,7 @@ enum batadv_dbg_level { BATADV_DBG_NC = BIT(5), BATADV_DBG_MCAST = BIT(6), BATADV_DBG_TP_METER = BIT(7), - BATADV_DBG_ALL = 127, + BATADV_DBG_ALL = 255, };

#ifdef CONFIG_BATMAN_ADV_DEBUG