The following commit has been merged in the merge/master branch: commit 74a41ef403151c1a22e2b2509743453e93f873ab Merge: 342f7f3acda95f70f25a58e31044c5f6e1a59407 ecdc9bc44b25bd1d99b79d5930998a1da2a6195e Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Jan 19 17:37:19 2016 +0100

Merge branch 'next'

diff --combined README.external index 963343e,03825ab..833ece7 --- a/README.external +++ b/README.external @@@ -6,7 -6,7 +6,7 @@@ and as external module. The external m new features without upgrading to a newer kernel version and to get batman-adv specific bugfixes for kernels that are not supported anymore. It compiles against and should work - with Linux 2.6.29 - 4.4. Supporting older versions is not + with Linux 2.6.29 - 4.5. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-)

@@@ -40,7 -40,6 +40,7 @@@ module). Available options and thei * CONFIG_BATMAN_ADV_DAT=[y*|n] (B.A.T.M.A.N. Distributed ARP Table) * CONFIG_BATMAN_ADV_MCAST=[y*|n] (B.A.T.M.A.N. multicast optimizations) * CONFIG_BATMAN_ADV_NC=[y|n*] (B.A.T.M.A.N. Network Coding) + * CONFIG_BATMAN_ADV_BATMAN_V=[y|n*] (B.A.T.M.A.N. V routing algorithm)

e.g., debugging can be enabled by

diff --combined net/batman-adv/main.h index 1ccfb3e,d1e11d4..7b05f68 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@@ -1,4 -1,4 +1,4 @@@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@@ -24,21 -24,17 +24,21 @@@ #define BATADV_DRIVER_DEVICE "batman-adv"

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

/* B.A.T.M.A.N. parameters */

#define BATADV_TQ_MAX_VALUE 255 +#define BATADV_THROUGHPUT_MAX_VALUE 0xFFFFFFFF #define BATADV_JITTER 20

/* Time To Live of broadcast messages */ #define BATADV_TTL 50

+/* maximum sequence number age of broadcast messages */ +#define BATADV_BCAST_MAX_AGE 64 + /* purge originators after time in seconds if no valid packet comes in * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE */ @@@ -61,15 -57,6 +61,15 @@@ #define BATADV_TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 #define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1

+/* B.A.T.M.A.N. V */ +#define BATADV_THROUGHPUT_DEFAULT_VALUE 10 +#define BATADV_ELP_PROBES_PER_NODE 2 +#define BATADV_ELP_MIN_PROBE_SIZE 200 /* bytes */ +#define BATADV_ELP_PROBE_MAX_TX_DIFF 100 /* milliseconds */ +#define BATADV_ELP_MAX_AGE 64 +#define BATADV_OGM_MAX_ORIGDIFF 5 +#define BATADV_OGM_MAX_AGE 64 + /* number of OGMs sent with the last tt diff */ #define BATADV_TT_OGM_APPEND_MAX 3

@@@ -110,6 -97,11 +110,6 @@@ */ #define BATADV_TQ_SIMILARITY_THRESHOLD 50

-/* how much worse secondary interfaces may be to be considered as bonding - * candidates - */ -#define BATADV_BONDING_TQ_THRESHOLD 50 - /* should not be bigger than 512 bytes or change the size of * forw_packet->direct_link_flags */