The following commit has been merged in the next branch: commit 2e8bad33846faecd76e5abfa010f964dbccdd77e Merge: 235be9b0292237b534428e3ce75c3b71e69a0324 89079aec4c0c2c60a3a2561afcce62538cebd71d Author: Sven Eckelmann sven@narfation.org Date: Sun May 1 22:37:40 2011 +0200

Merge branch 'master' into next

diff --combined main.h index 8dcb0c2,101d9dc..e939913 --- a/main.h +++ b/main.h @@@ -27,7 -27,7 +27,7 @@@ #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 */ @@@ -177,4 -177,6 +177,6 @@@ static inline int compare_eth(void *dat return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); }

+ #define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) + #endif /* _NET_BATMAN_ADV_MAIN_H_ */