Skip to contentSkip to conversation

batman-adv: (style) fix for switched vid-ifiindex parameter order

PATCH Superseded Linus Lüssing 2 participants 2 messages Jun 14, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 batman-adv: (style) fix for switched vid-ifiindex parameter order

batadv_tt_local_add() first takes the vid and then the interface index parameter. One of these calls had the order switched.

However in this case it is not a functional, but just a style fix because at the moment BATADV_NO_FLAGS is equal to BATADV_NULL_IFINDEX.

---
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
main.c +1 -1
index f2f1137..a7ad6cb 100644
@@ -128,7 +128,7 @@ int batadv_mesh_init(struct net_device *soft_iface)
 		goto err;
 
 	batadv_tt_local_add(soft_iface, soft_iface->dev_addr,
-			    BATADV_NULL_IFINDEX, BATADV_NO_FLAGS);
+			    BATADV_NO_FLAGS, BATADV_NULL_IFINDEX);
 
 	ret = batadv_bla_init(bat_priv);
 	if (ret < 0)
Signature · 1 line
1.7.10.4
Acked-by on v1 1/1
#1 lore raw

Hey Linus,

Quoted 6 lines · Linus Lüssing

batadv_tt_local_add() first takes the vid and then the interface index parameter. One of these calls had the order switched.

However in this case it is not a functional, but just a style fix because at the moment BATADV_NO_FLAGS is equal to BATADV_NULL_IFINDEX.

Thanks for fixing this :)

However, can you please resend this patch adding the commit id and the subject of the change introducing this problem? This will help me in squashing the original patch and this fix before sending the patches upstream. (Sorry for annoying with this :-))

Quoted 1 line

You can also add

Cheers,

Quoted 19 lines
---
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
main.c +1 -1
index f2f1137..a7ad6cb 100644
@@ -128,7 +128,7 @@ int batadv_mesh_init(struct net_device *soft_iface)
 		goto err;
 
 	batadv_tt_local_add(soft_iface, soft_iface->dev_addr,
-			    BATADV_NULL_IFINDEX, BATADV_NO_FLAGS);
+			    BATADV_NO_FLAGS, BATADV_NULL_IFINDEX);
 
 	ret = batadv_bla_init(bat_priv);
 	if (ret < 0)
Signature · 1 line
1.7.10.4
Signature · 4 lines
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara