Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Sat Mar 17 00:15:01 CET 2012


--- batman-adv_master.packet.h	2012-03-17 00:15:01.556768176 +0100
+++ batctl_master.packet.h	2012-03-17 00:15:01.560771320 +0100
@@ -47,7 +47,6 @@
 #define COMPAT_VERSION 14
 
 enum batman_iv_flags {
-	NOT_BEST_NEXT_HOP   = 1 << 3,
 	PRIMARIES_FIRST_HOP = 1 << 4,
 	VIS_SERVER	    = 1 << 5,
 	DIRECTLINK	    = 1 << 6


More information about the linux-merge mailing list