diff mbox

[v2,5/6] batman-adv: reorder batadv_iv_flags

Message ID 1366401149-31600-6-git-send-email-siwu@hrz.tu-chemnitz.de (mailing list archive)
State Superseded, archived
Headers

Commit Message

Simon Wunderlich April 19, 2013, 7:52 p.m. UTC 
  The vis flag is not needed anymore, and since we do a compat bump we
can start with the first bit again
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
---
 packet.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Marek Lindner April 20, 2013, 9:42 a.m. UTC | #1 
On Saturday, April 20, 2013 03:52:28 Simon Wunderlich wrote:
> @@ -70,10 +70,9 @@ enum batadv_subtype {
>  #define BATADV_COMPAT_VERSION 14
>  
>  enum batadv_iv_flags {
> -       BATADV_NOT_BEST_NEXT_HOP   = BIT(3),
> -       BATADV_PRIMARIES_FIRST_HOP = BIT(4),
> -       BATADV_VIS_SERVER          = BIT(5),
> -       BATADV_DIRECTLINK          = BIT(6),
> +       BATADV_NOT_BEST_NEXT_HOP   = BIT(0),
> +       BATADV_PRIMARIES_FIRST_HOP = BIT(1),
> +       BATADV_DIRECTLINK          = BIT(2),
>  };

Can we get some kernel doc here as well ?

Cheers,
Marek
diff mbox

Patch

diff --git a/packet.h b/packet.h
index 88d3aa6..cda3236 100644
--- a/packet.h
+++ b/packet.h
@@ -70,10 +70,9 @@  enum batadv_subtype {
 #define BATADV_COMPAT_VERSION 14
 
 enum batadv_iv_flags {
-	BATADV_NOT_BEST_NEXT_HOP   = BIT(3),
-	BATADV_PRIMARIES_FIRST_HOP = BIT(4),
-	BATADV_VIS_SERVER	   = BIT(5),
-	BATADV_DIRECTLINK	   = BIT(6),
+	BATADV_NOT_BEST_NEXT_HOP   = BIT(0),
+	BATADV_PRIMARIES_FIRST_HOP = BIT(1),
+	BATADV_DIRECTLINK	   = BIT(2),
 };
 
 /* ICMP message types */
@@ -167,11 +166,12 @@  struct batadv_header {
 /**
  * struct batadv_ogm_packet - ogm (routing protocol) packet
  * @header: common batman packet header
+ * @flags: contains routing relevant flags - see enum batadv_iv_flags
  * @tvlv_len: length of tvlv data following the ogm header
  */
 struct batadv_ogm_packet {
 	struct batadv_header header;
-	uint8_t  flags;    /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
+	uint8_t  flags;
 	__be32   seqno;
 	uint8_t  orig[ETH_ALEN];
 	uint8_t  prev_sender[ETH_ALEN];