diff options
author | David S. Miller <davem@davemloft.net> | 2011-06-09 14:56:13 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-09 14:56:13 -0700 |
commit | 6018e1183ba52735d47e8c183497d8598da75351 (patch) | |
tree | 3e9be6d850e292274ff05744ce36431492b975c7 /net/batman-adv/main.h | |
parent | 075cd29e307720dfde5b67d1715a102473bf4623 (diff) | |
parent | ecbd532108cb21d9d3770f73e168bad65d14d9eb (diff) | |
download | blackbird-op-linux-6018e1183ba52735d47e8c183497d8598da75351.tar.gz blackbird-op-linux-6018e1183ba52735d47e8c183497d8598da75351.zip |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/main.h')
-rw-r--r-- | net/batman-adv/main.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 610eaf0759ae..ed488cbae80f 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -51,6 +51,8 @@ #define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 #define TQ_TOTAL_BIDRECT_LIMIT 1 +#define NO_FLAGS 0 + #define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE) #define LOG_BUF_LEN 8192 /* has to be a power of 2 */ @@ -72,9 +74,11 @@ #define RESET_PROTECTION_MS 30000 #define EXPECTED_SEQNO_RANGE 65536 -#define MESH_INACTIVE 0 -#define MESH_ACTIVE 1 -#define MESH_DEACTIVATING 2 +enum mesh_state { + MESH_INACTIVE, + MESH_ACTIVE, + MESH_DEACTIVATING +}; #define BCAST_QUEUE_LEN 256 #define BATMAN_QUEUE_LEN 256 @@ -89,10 +93,11 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt /* 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 +enum dbg_level { + DBG_BATMAN = 1 << 0, + DBG_ROUTES = 1 << 1, /* route added / changed / deleted */ + DBG_ALL = 3 +}; /* |