[commits] batman-adv; branch, master, updated. v2011.1.0-96-gef0df12

The following commit has been merged in the master branch: commit ef0df12cf3921e110e934f73ce756beb2db9de2d Author: Sven Eckelmann sven@narfation.org Date: Mon May 9 10:15:32 2011 +0200

batman-adv: Fix build with linux 2.6.25-2.6.27

We must prevent that IPPROTO_UDP gets redefined using compat.h. Otherwise the build will fail when including things like net/addrconf.h

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/compat.c b/compat.c index 70de376..586898f 100644 --- a/compat.c +++ b/compat.c @@ -1,3 +1,4 @@ +#include <linux/in.h> #include <linux/version.h> #include "main.h"