commits April 2013

commits@lists.open-mesh.org

1 participants
115 discussions

[batctl] master: batctl: remove white spaces at the beginning of the lines (3a855cc)
by postmaster＠open-mesh.org 30 Apr '13

30 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 3a855cc192fd117ff3fd4165e55533670918b9c2 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Apr 28 12:00:29 2013 +0200 batctl: remove white spaces at the beginning of the lines Intiroduced by: 3bcf1e15714b78e8581ccbf4724cda9e20ac4aa4 ("batman-adv: reorder packet types") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 3a855cc192fd117ff3fd4165e55533670918b9c2 packet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packet.h b/packet.h index 559c738..7d45890 100644 --- a/packet.h +++ b/packet.h @@ -34,7 +34,7 @@ * @BATADV_ICMP: unicast packet like IP ICMP used for ping or traceroute * @BATADV_UNICAST_TVLV: unicast packet carrying TVLV containers */ - enum batadv_packettype { +enum batadv_packettype { /* 0x00 - 0x3f: local packets or special rules for handling */ BATADV_IV_OGM = 0x00, BATADV_BCAST = 0x01, @@ -80,7 +80,7 @@ enum batadv_iv_flags { BATADV_NOT_BEST_NEXT_HOP = BIT(0), BATADV_PRIMARIES_FIRST_HOP = BIT(1), BATADV_DIRECTLINK = BIT(2), - }; +}; /* ICMP message types */ enum batadv_icmp_packettype {

1 0

[batctl] master: batctl: use the BigEndian notation for variables sent over the wire (0979e72)
by postmaster＠open-mesh.org 30 Apr '13

30 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 0979e7217031b3c44cda7cfddbe6bbdedd2f6f13 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Apr 28 10:09:26 2013 +0200 batctl: use the BigEndian notation for variables sent over the wire All the variables sent over the wire must report the BigEndian (__be*) notation so that sparse can easily spot any bug due to missing conversions. This patch changes the type used by the up and download bandwidth in the new GW TVLV from uint32_t to __be32 and adds all the related conversions. Introduced by: 0853ec7fafe0a195754454832993c6b35e22b842 ("batman-adv: tvlv - gateway download/upload bandwidth container") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 0979e7217031b3c44cda7cfddbe6bbdedd2f6f13 packet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packet.h b/packet.h index 58fe4eb..559c738 100644 --- a/packet.h +++ b/packet.h @@ -372,8 +372,8 @@ struct batadv_tvlv_long { * @bandwidth_up: advertised uplink upload bandwidth */ struct batadv_tvlv_gateway_data { - uint32_t bandwidth_down; - uint32_t bandwidth_up; + __be32 bandwidth_down; + __be32 bandwidth_up; }; /**

1 0

[linux-merge]linux integration; annotated tag, v3.9, created. v3.9
by postmaster＠open-mesh.org 29 Apr '13

29 Apr '13

The annotated tag, v3.9 has been created at f73366b472547dd3fe6f4fb71d003773bb19d1d6 (tag) tagging c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (commit) replaces v3.9-rc8 tagged by Linus Torvalds on Sun Apr 28 17:36:09 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRfcB+AAoJEHm+PkMAQRiGmLAH/0bIpdOYylJhRDmVOztXpANP jRYYH00UiSIBz8XO463dbbtevT2pB8pIw5TCxBWBi/V5rnJS9X5pvAHyNZBDUvYd 3BQCQ2cnQ+6stFpi4o6NciZzQShDGMmUxAOD6ejZM35/P2l+ZKrNqBwy3R4oeMuZ /WUYZTCfFF3G7qgkHoOwIjM6c34v0tpqLfx4R5CdTnKe0Ow0OGb5ko5+lefD6i9m 6cd2GFlWeIUvw0FSMLyB+HN6Tkf3JnwrklP+vuLNV+uOq5BLwggGc6A1eS51IuVJ e/ZkGTtirz+mZiG5lvqSXHaVEObPsbm32XfVVHp1SiE+TIugDb2uhtEQEv+a43w= =UOGY -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: remove white spaces at the beginning of the lines (494fa44)
by postmaster＠open-mesh.org 29 Apr '13

29 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 494fa44be155dd5142b638b938590c41170a3e5c Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Apr 28 12:00:29 2013 +0200 batman-adv: remove white spaces at the beginning of the lines Intiroduced by: 3bcf1e15714b78e8581ccbf4724cda9e20ac4aa4 ("batman-adv: reorder packet types") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 494fa44be155dd5142b638b938590c41170a3e5c packet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packet.h b/packet.h index 559c738..7d45890 100644 --- a/packet.h +++ b/packet.h @@ -34,7 +34,7 @@ * @BATADV_ICMP: unicast packet like IP ICMP used for ping or traceroute * @BATADV_UNICAST_TVLV: unicast packet carrying TVLV containers */ - enum batadv_packettype { +enum batadv_packettype { /* 0x00 - 0x3f: local packets or special rules for handling */ BATADV_IV_OGM = 0x00, BATADV_BCAST = 0x01, @@ -80,7 +80,7 @@ enum batadv_iv_flags { BATADV_NOT_BEST_NEXT_HOP = BIT(0), BATADV_PRIMARIES_FIRST_HOP = BIT(1), BATADV_DIRECTLINK = BIT(2), - }; +}; /* ICMP message types */ enum batadv_icmp_packettype {

1 0

[batman-adv] master: Merge branch 'next' (c1d1c63)
by postmaster＠open-mesh.org 29 Apr '13

29 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c1d1c63831a4fe140a8005491c5ea008a0f31c7b Merge: b6acece 4e564b0 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Apr 29 15:11:43 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- c1d1c63831a4fe140a8005491c5ea008a0f31c7b bridge_loop_avoidance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (c1d1c63)
by postmaster＠open-mesh.org 29 Apr '13

29 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 4e564b0 batman-adv: remove white spaces in indentation c1d1c63 Merge branch 'next'

1 0

[batman-adv] next: batman-adv: remove white spaces in indentation (4e564b0)
by postmaster＠open-mesh.org 29 Apr '13

29 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 4e564b058aa75e73cc6eb117e60bd85ea813c568 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Apr 28 11:58:03 2013 +0200 batman-adv: remove white spaces in indentation Introduced during the merge of maint into next Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 4e564b058aa75e73cc6eb117e60bd85ea813c568 bridge_loop_avoidance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index cc530a7..e95cf4b 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -344,7 +344,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, if (vid & BATADV_VLAN_HAS_TAG) skb = vlan_insert_tag(skb, htons(ETH_P_8021Q), - vid & BATADV_VID_MASK); + vid & BATADV_VID_MASK); skb_reset_mac_header(skb); skb->protocol = eth_type_trans(skb, soft_iface);

1 0

[batman-adv] master: batman-adv: use the BigEndian notation for variables sent over the wire (b6acece)
by postmaster＠open-mesh.org 29 Apr '13

29 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b6acece9326829aa05082f3675acdf2251a814f5 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Apr 28 10:09:26 2013 +0200 batman-adv: use the BigEndian notation for variables sent over the wire All the variables sent over the wire must report the BigEndian (__be*) notation so that sparse can easily spot any bug due to missing conversions. This patch changes the type used by the up and download bandwidth in the new GW TVLV from uint32_t to __be32 and adds all the related conversions. Introduced by: 0853ec7fafe0a195754454832993c6b35e22b842 ("batman-adv: tvlv - gateway download/upload bandwidth container") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- b6acece9326829aa05082f3675acdf2251a814f5 gateway_client.c | 24 +++++++++++++----------- gateway_common.c | 4 ++-- packet.h | 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/gateway_client.c b/gateway_client.c index f00db73..973f02d 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -344,8 +344,10 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Found new gateway %pM -> gw bandwidth: %u.%u/%u.%u MBit\n", orig_node->orig, - gateway->bandwidth_down / 10, gateway->bandwidth_down % 10, - gateway->bandwidth_up / 10, gateway->bandwidth_up % 10); + ntohl(gateway->bandwidth_down) / 10, + ntohl(gateway->bandwidth_down) % 10, + ntohl(gateway->bandwidth_up) / 10, + ntohl(gateway->bandwidth_up) % 10); } /** @@ -399,8 +401,8 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, goto out; } - if ((gw_node->bandwidth_down == gateway->bandwidth_down) && - (gw_node->bandwidth_up == gateway->bandwidth_up)) + if ((gw_node->bandwidth_down == ntohl(gateway->bandwidth_down)) && + (gw_node->bandwidth_up == ntohl(gateway->bandwidth_up))) goto out; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, @@ -410,16 +412,16 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, gw_node->bandwidth_down % 10, gw_node->bandwidth_up / 10, gw_node->bandwidth_up % 10, - gateway->bandwidth_down / 10, - gateway->bandwidth_down % 10, - gateway->bandwidth_up / 10, - gateway->bandwidth_up % 10); + ntohl(gateway->bandwidth_down) / 10, + ntohl(gateway->bandwidth_down) % 10, + ntohl(gateway->bandwidth_up) / 10, + ntohl(gateway->bandwidth_up) % 10); - gw_node->bandwidth_down = gateway->bandwidth_down; - gw_node->bandwidth_up = gateway->bandwidth_up; + gw_node->bandwidth_down = ntohl(gateway->bandwidth_down); + gw_node->bandwidth_up = ntohl(gateway->bandwidth_up); gw_node->deleted = 0; - if (gateway->bandwidth_down == 0) { + if (ntohl(gateway->bandwidth_down) == 0) { gw_node->deleted = jiffies; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Gateway %pM removed from gateway list\n", diff --git a/gateway_common.c b/gateway_common.c index 9904710..07fd877 100644 --- a/gateway_common.c +++ b/gateway_common.c @@ -202,8 +202,8 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, gateway.bandwidth_up = 0; } else { gateway_ptr = tvlv_value; - gateway.bandwidth_down = ntohl(gateway_ptr->bandwidth_down); - gateway.bandwidth_up = ntohl(gateway_ptr->bandwidth_up); + gateway.bandwidth_down = gateway_ptr->bandwidth_down; + gateway.bandwidth_up = gateway_ptr->bandwidth_up; if ((gateway.bandwidth_down == 0) || (gateway.bandwidth_up == 0)) { gateway.bandwidth_down = 0; diff --git a/packet.h b/packet.h index 58fe4eb..559c738 100644 --- a/packet.h +++ b/packet.h @@ -372,8 +372,8 @@ struct batadv_tvlv_long { * @bandwidth_up: advertised uplink upload bandwidth */ struct batadv_tvlv_gateway_data { - uint32_t bandwidth_down; - uint32_t bandwidth_up; + __be32 bandwidth_down; + __be32 bandwidth_up; }; /**

1 0

[batman-adv] master's head updated: Merge branch 'next' (957f647)
by postmaster＠open-mesh.org 29 Apr '13

29 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 32cadb4 batman-adv: check proto length before accessing proto string buffer aa7d19a batman-adv: check proto length before accessing proto string buffer d544c5e Merge branch 'maint' into next 957f647 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (957f647)
by postmaster＠open-mesh.org 29 Apr '13

29 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 957f64752819e0fec716ba8399676f9a7224762d Merge: 208b49c d544c5e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Apr 29 15:07:43 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 957f64752819e0fec716ba8399676f9a7224762d main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2013