Skip to contentSkip to conversation

batman-adv: fix orig capabilities numbering

PATCH Applied Antonio Quartulli 2 participants 4 messages Sep 22, 2013 – Sep 24, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 batman-adv: fix orig capabilities numbering

Let's start the capabilities from bit 0.

Introduced by 2b1c07b918d2acc41555bbde9d538179acb308b4 ("batman-adv: tvlv - add distributed arp table container")

---
 types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
types.h +1 -1
index f323822..8465a55 100644
@@ -246,7 +246,7 @@ struct batadv_orig_node {
  * @BATADV_ORIG_CAPA_HAS_NC: orig node has network coding enabled
  */
 enum batadv_orig_capabilities {
-	BATADV_ORIG_CAPA_HAS_DAT = BIT(1),
+	BATADV_ORIG_CAPA_HAS_DAT = BIT(0),
 	BATADV_ORIG_CAPA_HAS_NC = BIT(2),
 };
 
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 2/2 batman-adv: fix orig capabilities numbering (NetCod)

Use bit 1 after bit 0.

Introduced by 7dd9d8992b0c197ba656a6d9a70966cea10fc2d9 ("batman-adv: tvlv - add network coding container")

---
 types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
types.h +1 -1
index 8465a55..04b6b0b 100644
@@ -247,7 +247,7 @@ struct batadv_orig_node {
  */
 enum batadv_orig_capabilities {
 	BATADV_ORIG_CAPA_HAS_DAT = BIT(0),
-	BATADV_ORIG_CAPA_HAS_NC = BIT(2),
+	BATADV_ORIG_CAPA_HAS_NC = BIT(1),
 };
 
 /**
Signature · 1 line
1.8.1.5
#2 lore raw

Re: [B.A.T.M.A.N.] [PATCH 2/2 next] batman-adv: fix orig capabilities numbering (NetCod)

Quoted 9 lines · On Sunday 22 September 2013 20:18:28 Antonio Quartulli wrote:

Use bit 1 after bit 0.

Introduced by 7dd9d8992b0c197ba656a6d9a70966cea10fc2d9 ("batman-adv: tvlv - add network coding container")

---
 types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision 4e458f4.

Thanks,
Marek

#3 lore raw
In reply to Antonio Quartulli
Quoted 9 lines · On Sunday 22 September 2013 20:18:27 Antonio Quartulli wrote:

Let's start the capabilities from bit 0.

Introduced by 2b1c07b918d2acc41555bbde9d538179acb308b4 ("batman-adv: tvlv - add distributed arp table container")

---
 types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision a5aa462.

Thanks,
Marek