The following commit has been merged in the next branch: commit be706a4ba1a0679c53a382f771a8c313b296b1ac Merge: 2e8bad33846faecd76e5abfa010f964dbccdd77e fea56a5a21183df396a77dc559ba6e5a70d8f7fa Author: Sven Eckelmann sven@narfation.org Date: Sun May 8 15:09:00 2011 +0200

Merge branch 'master' into next

diff --combined main.h index e939913,3ca3941..6259acb --- a/main.h +++ b/main.h @@@ -27,23 -27,25 +27,25 @@@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv"

-#define SOURCE_VERSION "devel" +#define SOURCE_VERSION "next"

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

#define TQ_MAX_VALUE 255 #define JITTER 20 - #define TTL 50 /* Time To Live of broadcast messages */

- #define PURGE_TIMEOUT 200 /* purge originators after time in seconds if no - * valid packet comes in -> TODO: check - * influence on TQ_LOCAL_WINDOW_SIZE */ - #define LOCAL_HNA_TIMEOUT 3600 /* in seconds */ + /* Time To Live of broadcast messages */ + #define TTL 50

- #define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator - * messages in squence numbers (should be a - * multiple of our word size) */ + /* purge originators after time in seconds if no valid packet comes in + * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ + #define PURGE_TIMEOUT 200 + #define TT_LOCAL_TIMEOUT 3600 /* in seconds */ + + /* sliding packet range of received originator messages in squence numbers + * (should be a multiple of our word size) */ + #define TQ_LOCAL_WINDOW_SIZE 64 #define TQ_GLOBAL_WINDOW_SIZE 5 #define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 #define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 @@@ -55,21 -57,20 +57,20 @@@

#define VIS_INTERVAL 5000 /* 5 seconds */

- /* how much worse secondary interfaces may be to - * to be considered as bonding candidates */ - + /* how much worse secondary interfaces may be to be considered as bonding + * candidates */ #define BONDING_TQ_THRESHOLD 50

- #define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or - * change the size of - * forw_packet->direct_link_flags */ + /* should not be bigger than 512 bytes or change the size of + * forw_packet->direct_link_flags */ + #define MAX_AGGREGATION_BYTES 512 #define MAX_AGGREGATION_MS 100

#define SOFTIF_NEIGH_TIMEOUT 180000 /* 3 minutes */

+ /* don't reset again within 30 seconds */ #define RESET_PROTECTION_MS 30000 #define EXPECTED_SEQNO_RANGE 65536 - /* don't reset again within 30 seconds */

#define MESH_INACTIVE 0 #define MESH_ACTIVE 1 @@@ -84,12 -85,13 +85,13 @@@ #ifdef pr_fmt #undef pr_fmt #endif - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt /* Append 'batman-adv: ' before - * kernel messages */ + /* Append 'batman-adv: ' before kernel messages */ + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

- #define DBG_BATMAN 1 /* all messages related to routing / flooding / - * broadcasting / etc */ - #define DBG_ROUTES 2 /* route or hna added / changed / deleted */ + /* all messages related to routing / flooding / broadcasting / etc */ + #define DBG_BATMAN 1 + /* route or tt entry added / changed / deleted */ + #define DBG_ROUTES 2 #define DBG_ALL 3