The following commit has been merged in the merge/master branch: commit bce19ab21b1aaea5bac0caff05ea808b2e987537 Merge: 5b0b10ea4b6adb532b9b21f6b90454574b3a9e6a 1e73793d319c051fe5907a64310cf0d83afe155a Author: Simon Wunderlich sw@simonwunderlich.de Date: Thu Nov 26 14:01:40 2015 +0100

Merge branch 'next'

diff --combined net/batman-adv/main.h index 5b79814,da9f16c..34f56ef --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@@ -24,7 -24,7 +24,7 @@@ #define BATADV_DRIVER_DEVICE "batman-adv"

#ifndef BATADV_SOURCE_VERSION - #define BATADV_SOURCE_VERSION "2015.2" + #define BATADV_SOURCE_VERSION "2016.0" #endif

/* B.A.T.M.A.N. parameters */ @@@ -109,7 -109,7 +109,7 @@@ #define BATADV_MAX_AGGREGATION_MS 100

#define BATADV_BLA_PERIOD_LENGTH 10000 /* 10 seconds */ -#define BATADV_BLA_BACKBONE_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 3) +#define BATADV_BLA_BACKBONE_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 6) #define BATADV_BLA_CLAIM_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 10) #define BATADV_BLA_WAIT_PERIODS 3

@@@ -273,14 -273,9 +273,14 @@@ static inline void _batadv_dbg(int typ pr_err("%s: " fmt, _netdev->name, ## arg); \ } while (0)

-/* returns 1 if they are the same ethernet addr +/** + * batadv_compare_eth - Compare two not u16 aligned Ethernet addresses + * @data1: Pointer to a six-byte array containing the Ethernet address + * @data2: Pointer other six-byte array containing the Ethernet address * * note: can't use ether_addr_equal() as it requires aligned memory + * + * Return: 1 if they are the same ethernet addr */ static inline bool batadv_compare_eth(const void *data1, const void *data2) { @@@ -292,7 -287,7 +292,7 @@@ * @timestamp: base value to compare with (in jiffies) * @timeout: added to base value before comparing (in milliseconds) * - * Returns true if current time is after timestamp + timeout + * Return: true if current time is after timestamp + timeout */ static inline bool batadv_has_timed_out(unsigned long timestamp, unsigned int timeout) @@@ -331,13 -326,7 +331,13 @@@ static inline void batadv_add_counter(s

#define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1)

-/* Sum and return the cpu-local counters for index 'idx' */ +/** + * batadv_sum_counter - Sum the cpu-local counters for index 'idx' + * @bat_priv: the bat priv with all the soft interface information + * @idx: index of counter to sum up + * + * Return: sum of all cpu-local counters + */ static inline u64 batadv_sum_counter(struct batadv_priv *bat_priv, size_t idx) { u64 *counters, sum = 0;