The following commit has been merged in the next branch: commit 03abca265651868a32b6bc2388a65e200fae197f Author: Sven Eckelmann sven@narfation.org Date: Wed Mar 7 09:07:46 2012 +0100

batman-adv: Don't begin block comments with only a /* line

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 677997b..a6d5d63 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -779,8 +779,7 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node, * information */ tq_own = (TQ_MAX_VALUE * total_count) / neigh_rq_count;

- /* - * 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE this does + /* 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE this does * affect the nearly-symmetric links only a little, but * punishes asymmetric links more. This will give a value * between 0 and TQ_MAX_VALUE diff --git a/main.h b/main.h index 3b727dd..95cb2af 100644 --- a/main.h +++ b/main.h @@ -107,9 +107,7 @@ enum uev_type {

#define GW_THRESHOLD 50

-/* - * Debug Messages - */ +/* Debug Messages */ #ifdef pr_fmt #undef pr_fmt #endif @@ -124,14 +122,7 @@ enum dbg_level { DBG_ALL = 7 };

- -/* - * Vis - */ - -/* - * Kernel headers - */ +/* Kernel headers */

#include <linux/mutex.h> /* mutex */ #include <linux/module.h> /* needed by all modules */