commits April 2013

commits@lists.open-mesh.org

1 participants
115 discussions

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

16 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3d36bed459f83e142e7370a6000305e869ef97bd Merge: c8bda21 0e59ab2 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 16 20:59:42 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 3d36bed459f83e142e7370a6000305e869ef97bd README.external | 1 + 1 file changed, 1 insertion(+)

1 0

[batman-adv] next: batman-adv: Add network coding option to external README (0e59ab2)
by postmaster＠open-mesh.org 16 Apr '13

16 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 0e59ab2426724b59aa0d87f6a284e59dabff33fc Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Tue Apr 16 12:59:04 2013 +0200 batman-adv: Add network coding option to external README Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 0e59ab2426724b59aa0d87f6a284e59dabff33fc README.external | 1 + 1 file changed, 1 insertion(+) diff --git a/README.external b/README.external index 01ce8ca..ed7cf7a 100644 --- a/README.external +++ b/README.external @@ -38,6 +38,7 @@ module). Available options and their possible values are * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) * CONFIG_BATMAN_ADV_BLA=[y*|n] (B.A.T.M.A.N. bridge loop avoidance) * CONFIG_BATMAN_ADV_DAT=[y*|n] (B.A.T.M.A.N. Distributed ARP Table) + * CONFIG_BATMAN_ADV_NC=[y|n*] (B.A.T.M.A.N. Network Coding) e.g., debugging can be enabled by

1 0

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

15 Apr '13

The annotated tag, v3.9-rc7 has been created at c03c4b22b8b29c522d986a1e5440e35eb2d08aa7 (tag) tagging 41ef2d5678d83af030125550329b6ae8b74618fa (commit) replaces v3.9-rc6 tagged by Linus Torvalds on Sun Apr 14 17:45:47 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.9-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRa02/AAoJEHm+PkMAQRiGDRoH/08Cu2LpmX4VN+YMC3BkGWxn 4oOHGqdN0hrIQ4TysC43QNL6g7QJUnIR6fChn7pRJ6a8ljdzKjDHr/tZSIPJE3Ns UAGIDaaQWnZvGmHPzpbo4gmdMOTxg9xmpgac6Qpk6QowPIPc6fhl6AichP9OdH2G Fp6Irfznn5ZCBldJYg2+umoHyFTZARCxtdOKmmUnB7zH0GaX5ZRf/R6nmZEPlxE+ 5qJC1yxRxJE+I7gjNRFovxaLPuAmjPy5j6NJuGP8rR6epkhcJ2EVHSliI3KDKAO6 D3Fy9T5qHv2A2gvSxtC0m5/1WrutXZqxZ/DOB/uv9U7vqomiIs/EsHIuvc9qFBY= =NrST -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Fix rcu_barrier() miss due to double call_rcu() in TT code (c8bda21)
by postmaster＠open-mesh.org 15 Apr '13

15 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c8bda218468a803a9a3d76d291cf748db2945ce4 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Mon Apr 15 21:43:29 2013 +0800 batman-adv: Fix rcu_barrier() miss due to double call_rcu() in TT code rcu_barrier() only waits for the currently scheduled rcu functions to finish - it won't wait for any function scheduled via another call_rcu() within an rcu scheduled function. Unfortunately our batadv_tt_orig_list_entry_free_ref() does just that, via a batadv_orig_node_free_ref() call, leading to our rcu_barrier() call potentially missing such a batadv_orig_node_free_ref(). This patch fixes this issue by calling the batadv_orig_node_free_rcu() directly from the rcu callback, removing the unnecessary, additional call_rcu() layer here. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- c8bda218468a803a9a3d76d291cf748db2945ce4 originator.c | 16 ++++++++++++++++ originator.h | 1 + translation-table.c | 7 ++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/originator.c b/originator.c index e8a54a8..f50553a 100644 --- a/originator.c +++ b/originator.c @@ -156,12 +156,28 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu) kfree(orig_node); } +/** + * batadv_orig_node_free_ref - decrement the orig node refcounter and possibly + * schedule an rcu callback for freeing it + * @orig_node: the orig node to free + */ void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node) { if (atomic_dec_and_test(&orig_node->refcount)) call_rcu(&orig_node->rcu, batadv_orig_node_free_rcu); } +/** + * batadv_orig_node_free_ref_now - decrement the orig node refcounter and + * possibly free it (without rcu callback) + * @orig_node: the orig node to free + */ +void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node) +{ + if (atomic_dec_and_test(&orig_node->refcount)) + batadv_orig_node_free_rcu(&orig_node->rcu); +} + void batadv_originator_free(struct batadv_priv *bat_priv) { struct batadv_hashtable *hash = bat_priv->orig_hash; diff --git a/originator.h b/originator.h index 476c623..7887b84 100644 --- a/originator.h +++ b/originator.h @@ -26,6 +26,7 @@ int batadv_originator_init(struct batadv_priv *bat_priv); void batadv_originator_free(struct batadv_priv *bat_priv); void batadv_purge_orig_ref(struct batadv_priv *bat_priv); void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node); +void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node); struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_neigh_node * diff --git a/translation-table.c b/translation-table.c index 9322320..96dfb38 100644 --- a/translation-table.c +++ b/translation-table.c @@ -144,7 +144,12 @@ static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu) struct batadv_tt_orig_list_entry *orig_entry; orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu); - batadv_orig_node_free_ref(orig_entry->orig_node); + + /* We are in an rcu callback here, therefore we cannot use + * batadv_orig_node_free_ref() and its call_rcu(): + * An rcu_barrier() wouldn't wait for that to finish + */ + batadv_orig_node_free_ref_now(orig_entry->orig_node); kfree(orig_entry); }

1 0

[batman-adv] master: batman-adv: don't initialise batman_iv private members in hard-interface.c (1cc6cbc)
by postmaster＠open-mesh.org 15 Apr '13

15 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1cc6cbc51cb985bd1e43aeeaff545b889b9742b1 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue Apr 2 12:16:53 2013 +0200 batman-adv: don't initialise batman_iv private members in hard-interface.c hard-interface.c has to do not contain any routing algorithm specific code. Allocate the hard-interface with kzalloc() and remove any useless and algorithm specific member initialisation Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 1cc6cbc51cb985bd1e43aeeaff545b889b9742b1 hard-interface.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index 18f4523..dc4ac29 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -577,7 +577,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) dev_hold(net_dev); - hard_iface = kmalloc(sizeof(*hard_iface), GFP_ATOMIC); + hard_iface = kzalloc(sizeof(*hard_iface), GFP_ATOMIC); if (!hard_iface) goto release_dev; @@ -603,12 +603,6 @@ batadv_hardif_add_interface(struct net_device *net_dev) batadv_check_known_mac_addr(hard_iface->net_dev); list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list); - /* This can't be called via a bat_priv callback because - * we have no bat_priv yet. - */ - atomic_set(&hard_iface->bat_iv.ogm_seqno, 1); - hard_iface->bat_iv.ogm_buff = NULL; - return hard_iface; free_if:

1 0

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

08 Apr '13

The annotated tag, v3.9-rc6 has been created at 2c8edfa75a6f7de3abc6061c5f665735de07dbee (tag) tagging 31880c37c11e28cb81c70757e38392b42e695dc6 (commit) replaces v3.9-rc5 tagged by Linus Torvalds on Sun Apr 7 20:50:03 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.9-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRYj5vAAoJEHm+PkMAQRiGEbIH/0aPHEyCH6a/x1Y8CKwoI6gZ wE+xSG8G+HHnQUEpRdZ3JIG8SplFH+bG5mFP5VRZIUD8Kk4C63jbUEgXAOa0WYdt 8jSWy5IeVb7giaVNG3R31V/zYFfOq8zFtYUDs0ijAoq/h2+BXITYz+KIYvTU956L akwOF0wkQZZbjXCSHL6xV4Z5/Jf15/a8mEM4zvZ2O6tp62EBAhJnjEGXezP0EdPc pHPcPmdwr88UONZwHCNfBSJWOy09vJ482hPS5i7PjsvhhMrVL6LOTKG2iP05qCAE zs3faMEs+7jneeJB42RicVdBWmhR5V5rNRoMSdjhgdcJgRJwKkye7ShKT61+eSU= =bSm6 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master's head updated: batctl: tcpdump - print subtype for UNICAST4ADDR packets (02921f7)
by postmaster＠open-mesh.org 03 Apr '13

03 Apr '13

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 0ae03c9 batctl: fix 4addr parsing in tcpdump 02921f7 batctl: tcpdump - print subtype for UNICAST4ADDR packets

1 0

[batctl] next: batctl: tcpdump - print subtype for UNICAST4ADDR packets (02921f7)
by postmaster＠open-mesh.org 03 Apr '13

03 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 02921f7519a296da09c2679ee0f3cc842b47c6cb Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Apr 2 22:34:30 2013 +0200 batctl: tcpdump - print subtype for UNICAST4ADDR packets Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 02921f7519a296da09c2679ee0f3cc842b47c6cb tcpdump.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index f69ac6f..b4cfec9 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -560,9 +560,10 @@ static void dump_batman_4addr(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); - printf("%s: 4ADDR, ttvn %d, ttl %hhu, ", + printf("%s: 4ADDR, subtybe %hhu, ttvn %d, ttl %hhu, ", get_name_by_macaddr((struct ether_addr *)unicast_4addr_packet->u.dest, read_opt), - unicast_4addr_packet->u.ttvn, unicast_4addr_packet->u.header.ttl); + unicast_4addr_packet->subtype, unicast_4addr_packet->u.ttvn, + unicast_4addr_packet->u.header.ttl); parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct batadv_unicast_4addr_packet), buff_len - ETH_HLEN - sizeof(struct batadv_unicast_4addr_packet),

1 0

[batctl] next: batctl: fix 4addr parsing in tcpdump (0ae03c9)
by postmaster＠open-mesh.org 03 Apr '13

03 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 0ae03c92ce98bca314ef6795ab788fc698f5b0a1 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Apr 2 22:34:29 2013 +0200 batctl: fix 4addr parsing in tcpdump In the UNICAST4ADDR parsing routing a wrong type is used to parse the batman header, resulting in a wrong data visualization. Fix this by using the correct data type. Introduced by 70aefcf8abefd509e5721c6ae228d3854d5e8b16 ("batctl: Add minimal unicast 4addr dissector support") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 0ae03c92ce98bca314ef6795ab788fc698f5b0a1 tcpdump.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index f357c6d..f69ac6f 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -545,14 +545,14 @@ static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int r static void dump_batman_4addr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct ether_header *ether_header; - struct batadv_unicast_packet *unicast_4addr_packet; + struct batadv_unicast_4addr_packet *unicast_4addr_packet; - LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batadv_unicast_packet), "BAT 4ADDR"); - LEN_CHECK((size_t)buff_len - sizeof(struct ether_header) - sizeof(struct batadv_unicast_packet), + LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batadv_unicast_4addr_packet), "BAT 4ADDR"); + LEN_CHECK((size_t)buff_len - sizeof(struct ether_header) - sizeof(struct batadv_unicast_4addr_packet), sizeof(struct ether_header), "BAT 4ADDR (unpacked)"); ether_header = (struct ether_header *)packet_buff; - unicast_4addr_packet = (struct batadv_unicast_packet *)(packet_buff + sizeof(struct ether_header)); + unicast_4addr_packet = (struct batadv_unicast_4addr_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) time_printed = print_time(); @@ -561,11 +561,11 @@ static void dump_batman_4addr(unsigned char *packet_buff, ssize_t buff_len, int get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); printf("%s: 4ADDR, ttvn %d, ttl %hhu, ", - get_name_by_macaddr((struct ether_addr *)unicast_4addr_packet->dest, read_opt), - unicast_4addr_packet->ttvn, unicast_4addr_packet->header.ttl); + get_name_by_macaddr((struct ether_addr *)unicast_4addr_packet->u.dest, read_opt), + unicast_4addr_packet->u.ttvn, unicast_4addr_packet->u.header.ttl); - parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct batadv_unicast_packet), - buff_len - ETH_HLEN - sizeof(struct batadv_unicast_packet), + parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct batadv_unicast_4addr_packet), + buff_len - ETH_HLEN - sizeof(struct batadv_unicast_4addr_packet), read_opt, time_printed); }

1 0

[batman-adv] master: batman-adv: do not silently ignore wrong condition (c969b9e)
by postmaster＠open-mesh.org 03 Apr '13

03 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c969b9ef335252c7208057e12f6c8a8ea41da06f Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Mar 30 17:22:00 2013 +0100 batman-adv: do not silently ignore wrong condition Only one neigh_node per orig_node should match a given neighbor address, therefore, if more than one matching neigh_node is found, a WARNING has to be triggered to let the user know that something is wrong in the originator state instead of silently skipping the error. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- c969b9ef335252c7208057e12f6c8a8ea41da06f bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 38183dc..bd50e0d 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -669,7 +669,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, if (batadv_compare_eth(neigh_addr, ethhdr->h_source) && tmp_neigh_node->if_incoming == if_incoming && atomic_inc_not_zero(&tmp_neigh_node->refcount)) { - if (neigh_node) + if (WARN(neigh_node, "too many matching neigh_nodes")) batadv_neigh_node_free_ref(neigh_node); neigh_node = tmp_neigh_node; continue;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2013