commits November 2012

commits@lists.open-mesh.org

1 participants
86 discussions

[linux-merge]linux integration; branch, merge/master, updated. v3.7-rc1-1626-gaa02021
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

The following commit has been merged in the merge/master branch: commit aa020218f6126ca8b4c2a2deb2a640cace665aa2 Merge: 94668774eec54bf17022f005c47ba3d9aa237e4e 7f05664526b213452f2d1bc8f2e120899752f15d Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Nov 13 09:51:18 2012 +0100 Merge remote-tracking branch 'pkg/next' into merge/master diff --combined net/batman-adv/soft-interface.c index 2d1f895,54800c7..54800c7 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -347,6 -347,12 +347,12 @@@ void batadv_interface_rx(struct net_dev soft_iface->last_rx = jiffies; + /* Let the bridge loop avoidance check the packet. If will + * not handle it, we can safely push it up. + */ + if (batadv_bla_rx(bat_priv, skb, vid, is_bcast)) + goto out; + if (orig_node) batadv_tt_add_temporary_global_entry(bat_priv, orig_node, ethhdr->h_source); @@@ -354,12 -360,6 +360,6 @@@ if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) goto dropped; - /* Let the bridge loop avoidance check the packet. If will - * not handle it, we can safely push it up. - */ - if (batadv_bla_rx(bat_priv, skb, vid, is_bcast)) - goto out; - netif_rx(skb); goto out; diff --combined net/batman-adv/translation-table.c index cb0281a,22457a7..22457a7 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -2545,7 -2545,7 +2545,7 @@@ bool batadv_tt_local_client_is_roaming( if (!tt_local_entry) goto out; - ret = !!(tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM); + ret = tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM; batadv_tt_local_entry_free_ref(tt_local_entry); out: return ret; @@@ -2558,6 -2558,13 +2558,13 @@@ bool batadv_tt_add_temporary_global_ent { bool ret = false; + /* if the originator is a backbone node (meaning it belongs to the same + * LAN of this node) the temporary client must not be added because to + * reach such destination the node must use the LAN instead of the mesh + */ + if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig)) + goto out; + if (!batadv_tt_global_add(bat_priv, orig_node, addr, BATADV_TT_CLIENT_TEMP, atomic_read(&orig_node->last_ttvn))) -- linux integration

1 0

[batman-adv] master's head updated: batman-adv: remove useless !! when converting to bool (7f05664)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 7f05664 batman-adv: remove useless !! when converting to bool

1 0

[batman-adv] next: batman-adv: remove useless !! when converting to bool (7f05664)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 7f05664526b213452f2d1bc8f2e120899752f15d Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 12 20:48:21 2012 +0100 batman-adv: remove useless !! when converting to bool In C standard any expression different from 0 will be converted to 'true' when casting to bool (whatever is the length of the value). Therefore the "!!" conversion can be removed. This was introduced by 3fbd7ac8c71b3778c5751b3d096ea36f96ef534e ("batman-adv: substitute tt_poss_change with a per-tt_entry flag") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 7f05664526b213452f2d1bc8f2e120899752f15d translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index f02e5a1..22457a7 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2545,7 +2545,7 @@ bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv, if (!tt_local_entry) goto out; - ret = !!(tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM); + ret = tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM; batadv_tt_local_entry_free_ref(tt_local_entry); out: return ret;

1 0

[batman-adv] master's head updated: Merge branch 'maint' into next (f9f727d)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 9b5c6ae batman-adv: don't add TEMP clients belonging to other backbone nodes 4dba221 batman-adv: process broadcast packets in BLA earlier f9f727d Merge branch 'maint' into next

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (f9f727d)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 9b5c6ae batman-adv: don't add TEMP clients belonging to other backbone nodes 4dba221 batman-adv: process broadcast packets in BLA earlier f9f727d Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (f9f727d)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit f9f727d6b2c068bebeeb0b502da6ac9bd530e07e Merge: bc91a4a 4dba221 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Nov 13 16:32:58 2012 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- f9f727d6b2c068bebeeb0b502da6ac9bd530e07e soft-interface.c | 12 ++++++------ translation-table.c | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-)

1 0

[batman-adv] maint: batman-adv: process broadcast packets in BLA earlier (4dba221)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 4dba2215b3b1cb7e61431165a1db1adef5c1f9e5 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 8 21:55:30 2012 +0100 batman-adv: process broadcast packets in BLA earlier The logic in the BLA mechanism may decide to drop broadcast packets because the node may still be in the setup phase. For this reason, further broadcast processing like the early client detection mechanism must be done only after the BLA check. This patches moves the invocation to BLA before any other broadcast processing. This was introduced by 724d05c8215e4e8186097121595ef20b6ba601b7 ("batman-adv: detect not yet announced clients") Reported-by: Glen Page <glen.page(a)thet.net> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 4dba2215b3b1cb7e61431165a1db1adef5c1f9e5 soft-interface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index b9a28d2..ce0684a 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -325,6 +325,12 @@ void batadv_interface_rx(struct net_device *soft_iface, soft_iface->last_rx = jiffies; + /* Let the bridge loop avoidance check the packet. If will + * not handle it, we can safely push it up. + */ + if (batadv_bla_rx(bat_priv, skb, vid, is_bcast)) + goto out; + if (orig_node) batadv_tt_add_temporary_global_entry(bat_priv, orig_node, ethhdr->h_source); @@ -332,12 +338,6 @@ void batadv_interface_rx(struct net_device *soft_iface, if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) goto dropped; - /* Let the bridge loop avoidance check the packet. If will - * not handle it, we can safely push it up. - */ - if (batadv_bla_rx(bat_priv, skb, vid, is_bcast)) - goto out; - netif_rx(skb); goto out;

1 0

[batman-adv] maint: batman-adv: don't add TEMP clients belonging to other backbone nodes (9b5c6ae)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 9b5c6ae19e49fcfe1cc353aabc6a79a487a957ce Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 8 21:55:29 2012 +0100 batman-adv: don't add TEMP clients belonging to other backbone nodes The "early client detection" mechanism must not add clients belonging to other backbone nodes. Such clients must be reached by directly using the LAN instead of the mesh. This was introduced by 724d05c8215e4e8186097121595ef20b6ba601b7 ("batman-adv: detect not yet announced clients") Reported-by: Glen Page <glen.page(a)thet.net> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 9b5c6ae19e49fcfe1cc353aabc6a79a487a957ce translation-table.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/translation-table.c b/translation-table.c index fec1a00..baae715 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2456,6 +2456,13 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, { bool ret = false; + /* if the originator is a backbone node (meaning it belongs to the same + * LAN of this node) the temporary client must not be added because to + * reach such destination the node must use the LAN instead of the mesh + */ + if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig)) + goto out; + if (!batadv_tt_global_add(bat_priv, orig_node, addr, BATADV_TT_CLIENT_TEMP, atomic_read(&orig_node->last_ttvn)))

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 12 Nov '12

12 Nov '12

The annotated tag, batman-adv-for-davem has been updated to 3863ad19bda3443d3b6f4715402137bc9b713962 (tag) from 7ef1bfdf3ee59f1668e1735b8cb5b165776202ae (which is now obsolete) tagging 66575f062f866c12612a014c2280c49be9fdf459 (commit) replaces v3.7-rc3 tagged by Antonio Quartulli on Mon Nov 12 19:43:51 2012 +0100 - Shortlog ------------------------------------------------------------ Included changes: - hash computation improvements - Bridge Loop Avoidance set-up phase optimisations - Roaming handling code redesign - some code cleanups -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlChRoAACgkQpGgxIkP9cwdDzACfdzMDFJh2riH+VQ9fkf4nq1z6 xEMAnjUHQU+cVcKVWnP6SJfaA5cMaiKt =VpCs -----END PGP SIGNATURE----- Antonio Quartulli (23): batman-adv: use check_unicast_packet() in recv_roam_adv() batman-adv: return proper value in case of hash_add failure batman-adv: properly store the roaming time batman-adv: print packets re-routing on DBG_TT and ratelimit it batman-adv: check for more space before accessing the skb batman-adv: properly convert flag into a boolean value batman-adv: pass the WIFI flag from the local to global entry batman-adv: add kernel-doc for enum batadv_dbg_level batman-adv: add UNICAST_4ADDR packet type batman-adv: Distributed ARP Table - add a new debug log level batman-adv: Distributed ARP Table - create DHT helper functions batman-adv: Distributed ARP Table - implement local storage batman-adv: Distributed ARP Table - add ARP parsing functions batman-adv: Distributed ARP Table - add snooping functions for ARP messages batman-adv: Distributed ARP Table - add compile option batman-adv: Distributed ARP Table - add runtime switch batman-adv: enable fast client detection using unicast_4addr packets batman-adv: fix wrong spinlock inline comment batman-adv: prevent using any virtual device created on batman-adv as hard-interface batman-adv: substitute tt_poss_change with a per-tt_entry flag batman-adv: refactor code to simplify long lines batman-adv: refactor tt_global_del_struct() batman-adv: roaming handling mechanism redesign Marek Lindner (2): batman-adv: split hard_iface struct for each routing protocol batman-adv: consolidate duplicated primary_if checking code Martin Hundebøll (1): batman-adv: Add get_ethtool_stats() support for DAT Simon Wunderlich (5): batman-adv: don't allow ECTP traffic on batman-adv batman-adv: don't rely on positions in struct for hashing batman-adv: send announcement when backbone gw is registered batman-adv: allow bla traffic only after first worker period batman-adv: wait multiple periods before activating bla Sven Eckelmann (8): batman-adv: Remove unused define BAT_ATTR_HIF_UINT batman-adv: Set special lockdep classes to avoid lockdep warning batman-adv: Remove extra check in batadv_bit_get_packet batman-adv: Check return value of try_module_get batman-adv: Only increase refcounter once for alternate router batman-adv: Reserve extra bytes in skb for better alignment batman-adv: Mark correctly aligned headers not as __packed batman-adv: Remove instant overwritten variable initialization ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.7-rc1-1621-g9466877
by postmaster＠open-mesh.org 12 Nov '12

12 Nov '12

The following commit has been merged in the merge/master branch: commit 94668774eec54bf17022f005c47ba3d9aa237e4e Merge: 3b9bcebb9aa41474afaee34286d8a09a751a66fa bc91a4a7e00c9610dd6285e5ca8bea9cb208cbe7 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Nov 9 11:27:09 2012 +0100 Merge remote-tracking branch 'pkg/next' into merge/master diff --combined net/batman-adv/routing.c index 63ff456,1aa1722..1aa1722 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@@ -877,11 -877,10 +877,10 @@@ out * @bat_priv: the bat priv with all the soft interface information * @unicast_packet: the unicast header to be updated * @dst_addr: the payload destination - * @msg: the message to print explaining the reason of the requested re-route * - * Search the global translation table for dst_addr and update the unicast - * header with the new corresponding information (originator address where the - * destination client currently is and its known TTVN) + * Search the translation table for dst_addr and update the unicast header with + * the new corresponding information (originator address where the destination + * client currently is and its known TTVN) * * Returns true if the packet header has been updated, false otherwise */ diff --combined net/batman-adv/translation-table.c index f3628a2,cb0281a..cb0281a --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -336,8 -336,10 +336,10 @@@ add_event batadv_tt_local_event(bat_priv, addr, tt_local->common.flags); check_roaming: - /* Check whether it is a roaming! */ - if (tt_global) { + /* Check whether it is a roaming, but don't do anything if the roaming + * process has already been handled + */ + if (tt_global && !(tt_global->common.flags & BATADV_TT_CLIENT_ROAM)) { /* These node are probably going to update their tt table */ head = &tt_global->orig_list; rcu_read_lock(); @@@ -859,6 -861,12 +861,12 @@@ int batadv_tt_global_add(struct batadv_ */ common->flags &= ~BATADV_TT_CLIENT_TEMP; + /* the change can carry possible "attribute" flags like the + * TT_CLIENT_WIFI, therefore they have to be copied in the + * client entry + */ + tt_global_entry->common.flags |= flags; + /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a * delete + roaming change for this originator. @@@ -1610,7 -1618,7 +1618,7 @@@ batadv_tt_response_fill_table(uint16_t memcpy(tt_change->addr, tt_common_entry->addr, ETH_ALEN); - tt_change->flags = BATADV_NO_FLAGS; + tt_change->flags = tt_common_entry->flags; tt_count++; tt_change++; @@@ -2034,7 -2042,8 +2042,8 @@@ bool batadv_is_my_client(struct batadv_ /* Check if the client has been logically deleted (but is kept for * consistency purpose) */ - if (tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) + if ((tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) || + (tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM)) goto out; ret = true; out: -- linux integration

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2012