batman-adv: update compat version

Message ID 1295518649-25141-1-git-send-email-lindner_marek@yahoo.de
State Rejected, archived
Headers

Commit Message

Marek Lindner Jan. 20, 2011, 10:17 a.m. UTC
  The compatibility version has to be updated as the OGM packet
received a new field (gw_flags).

Reported-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 batman-adv/packet.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
  

Comments

Sven Eckelmann Jan. 20, 2011, 10:57 a.m. UTC | #1
On Thursday 20 January 2011 11:17:29 Marek Lindner wrote:
> The compatibility version has to be updated as the OGM packet
> received a new field (gw_flags).

Why that? Compat 12 was the version with gw flags.
 http://www.open-mesh.org/wiki/BatmanAdvCompatVersion
  
Marek Lindner Jan. 20, 2011, 11:01 a.m. UTC | #2
On Thursday 20 January 2011 11:57:23 Sven Eckelmann wrote:
> On Thursday 20 January 2011 11:17:29 Marek Lindner wrote:
> > The compatibility version has to be updated as the OGM packet
> > received a new field (gw_flags).
> 
> Why that? Compat 12 was the version with gw flags.
>  http://www.open-mesh.org/wiki/BatmanAdvCompatVersion

Cool - I knew there was an overview table somewhere but I did not manage to 
find it.  :-)

As the table states 2010.2.0 got version 13 but trunk & next are on 12. I made 
a diff between the packet.h files and saw the gateway flags, therefore I proposed 
to increase the version number to 14. Should the next release contain a 
version smaller than the previous release ?

Regards,
Marek
  
Sven Eckelmann Jan. 20, 2011, 11:36 a.m. UTC | #3
On Thursday 20 January 2011 12:01:14 Marek Lindner wrote:
> As the table states 2010.2.0 got version 13 but trunk & next are on 12. I
> made a diff between the packet.h files and saw the gateway flags,
> therefore I proposed to increase the version number to 14. Should the next
> release contain a version smaller than the previous release ?

If you promise that we won't have a feature in trunk but not in next for 
ages... Personally I don't see the reason to make a fully compatible version 
incompatible. And I don't want to explain David S. Miller why he has to merge 
such a change (and the merge window is closed now).

Best regards,
	Sven
  
Marek Lindner Jan. 20, 2011, 5:24 p.m. UTC | #4
On Thursday 20 January 2011 12:36:49 Sven Eckelmann wrote:
> If you promise that we won't have a feature in trunk but not in next for 
> ages... Personally I don't see the reason to make a fully compatible
> version  incompatible. And I don't want to explain David S. Miller why he
> has to merge such a change (and the merge window is closed now).

Ok, sounds reasonable. Let's not forget to increase to 14 then. ;-)

Regards,
Marek
  

Patch

diff --git a/batman-adv/packet.h b/batman-adv/packet.h
index 2284e81..b595bde 100644
--- a/batman-adv/packet.h
+++ b/batman-adv/packet.h
@@ -32,7 +32,7 @@ 
 #define BAT_UNICAST_FRAG 0x06
 
 /* this file is included by batctl which needs these defines */
-#define COMPAT_VERSION 12
+#define COMPAT_VERSION 14
 #define DIRECTLINK 0x40
 #define VIS_SERVER 0x20
 #define PRIMARIES_FIRST_HOP 0x10