commits November 2012

commits@lists.open-mesh.org

1 participants
86 discussions

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

14 Nov '12

The annotated tag, batman-adv-for-davem has been updated to ccf238b2e8b476aabc565e5ea34c92dc3737240b (tag) from cef0b3be8e9db9ef03a4e90755c0b73be71185ce (which is now obsolete) tagging 170173bf37342dab486daaa2a0381d802c10fb21 (commit) replaces v3.7-rc3 tagged by Antonio Quartulli on Wed Nov 14 21:01:55 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) iEYEABECAAYFAlCj+LkACgkQpGgxIkP9cwdrJwCdF4IscHc1bVWCYdUZ39jPwM82 3IcAn0BlPsO7cUXsNIGz3ZJZnK+ccnfq =a5hZ -----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-1628-g4e4c770
by postmaster＠open-mesh.org 14 Nov '12

14 Nov '12

The following commit has been merged in the merge/master branch: commit 4e4c770352f96df09cb2c336bb3fe6ea9d8beaf4 Merge: aa020218f6126ca8b4c2a2deb2a640cace665aa2 803bae00f0ed480ed4be0b28792847162b0b91bc Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Nov 14 20:42:47 2012 +0100 Merge remote-tracking branch 'pkg/next' into merge/master diff --combined net/batman-adv/bridge_loop_avoidance.c index b6da6ae,fc56ea2..fc56ea2 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -43,8 -43,8 +43,8 @@@ static inline uint32_t batadv_choose_cl struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - batadv_hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); - batadv_hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); + hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr)); + hash = batadv_hash_bytes(hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); @@@ -60,8 -60,8 +60,8 @@@ static inline uint32_t batadv_choose_ba struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - batadv_hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); - batadv_hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); + hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr)); + hash = batadv_hash_bytes(hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); diff --combined net/batman-adv/hash.h index f173427,e053339..e053339 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@@ -86,17 -86,21 +86,21 @@@ static inline void batadv_hash_delete(s * @hash: previous hash value * @data: data to be hashed * @size: number of bytes to be hashed + * + * Returns the new hash value. */ - static inline void batadv_hash_bytes(uint32_t *hash, void *data, uint32_t size) + static inline uint32_t batadv_hash_bytes(uint32_t hash, void *data, + uint32_t size) { const unsigned char *key = data; int i; for (i = 0; i < size; i++) { - *hash += key[i]; - *hash += (*hash << 10); - *hash ^= (*hash >> 6); + hash += key[i]; + hash += (hash << 10); + hash ^= (hash >> 6); } + return hash; } /** -- linux integration

1 0

[batman-adv] master's head updated: Merge branch 'next' (704252b)
by postmaster＠open-mesh.org 14 Nov '12

14 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 803bae0 batman-adv: pass value in batadv_hash_bytes 704252b Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (704252b)
by postmaster＠open-mesh.org 14 Nov '12

14 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 704252bc6da5a96e3d741fbb1a039ab7afc8187d Merge: 59cb086 803bae0 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Nov 15 00:33:58 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- 704252bc6da5a96e3d741fbb1a039ab7afc8187d bridge_loop_avoidance.c | 8 ++++---- hash.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-)

1 0

[batman-adv] next: batman-adv: pass value in batadv_hash_bytes (803bae0)
by postmaster＠open-mesh.org 14 Nov '12

14 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 803bae00f0ed480ed4be0b28792847162b0b91bc Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Wed Nov 14 10:53:48 2012 +0100 batman-adv: pass value in batadv_hash_bytes Passing the hash value by reference creates unneeded overhead. Pass by value instead. Reported-by: David Miller <davem(a)davemloft.net> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 803bae00f0ed480ed4be0b28792847162b0b91bc bridge_loop_avoidance.c | 8 ++++---- hash.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index b6da6ae..fc56ea2 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -43,8 +43,8 @@ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - batadv_hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); - batadv_hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); + hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr)); + hash = batadv_hash_bytes(hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); @@ -60,8 +60,8 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data, struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - batadv_hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); - batadv_hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); + hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr)); + hash = batadv_hash_bytes(hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); diff --git a/hash.h b/hash.h index f173427..e053339 100644 --- a/hash.h +++ b/hash.h @@ -86,17 +86,21 @@ static inline void batadv_hash_delete(struct batadv_hashtable *hash, * @hash: previous hash value * @data: data to be hashed * @size: number of bytes to be hashed + * + * Returns the new hash value. */ -static inline void batadv_hash_bytes(uint32_t *hash, void *data, uint32_t size) +static inline uint32_t batadv_hash_bytes(uint32_t hash, void *data, + uint32_t size) { const unsigned char *key = data; int i; for (i = 0; i < size; i++) { - *hash += key[i]; - *hash += (*hash << 10); - *hash ^= (*hash >> 6); + hash += key[i]; + hash += (hash << 10); + hash ^= (hash >> 6); } + return hash; } /**

1 0

[batman-adv] master: batman-adv: improve local translation table output (59cb086)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 59cb0861498776c62bd17584c31f34477fa301a0 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 8 22:16:16 2012 +0100 batman-adv: improve local translation table output This patch adds a nice header to the local translation table and the last_seen time for each local entry Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 59cb0861498776c62bd17584c31f34477fa301a0 translation-table.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index 22457a7..32d32d7 100644 --- a/translation-table.c +++ b/translation-table.c @@ -472,10 +472,14 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) struct batadv_priv *bat_priv = netdev_priv(net_dev); struct batadv_hashtable *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common_entry; + struct batadv_tt_local_entry *tt_local; struct batadv_hard_iface *primary_if; struct hlist_node *node; struct hlist_head *head; uint32_t i; + int last_seen_secs; + int last_seen_msecs; + unsigned long last_seen_jiffies; primary_if = batadv_seq_print_text_primary_if_get(seq); if (!primary_if) @@ -484,6 +488,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, "Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n", net_dev->name, (uint8_t)atomic_read(&bat_priv->tt.vn)); + seq_printf(seq, " %-13s %-7s %-10s\n", "Client", "Flags", + "Last seen"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -491,7 +497,15 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) rcu_read_lock(); hlist_for_each_entry_rcu(tt_common_entry, node, head, hash_entry) { - seq_printf(seq, " * %pM [%c%c%c%c%c]\n", + tt_local = container_of(tt_common_entry, + struct batadv_tt_local_entry, + common); + last_seen_jiffies = jiffies - tt_local->last_seen; + last_seen_msecs = jiffies_to_msecs(last_seen_jiffies); + last_seen_secs = last_seen_msecs / 1000; + last_seen_msecs = last_seen_msecs % 1000; + + seq_printf(seq, " * %pM [%c%c%c%c%c] %3u.%03u\n", tt_common_entry->addr, (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), @@ -502,7 +516,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) (tt_common_entry->flags & BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & - BATADV_TT_CLIENT_WIFI ? 'W' : '.')); + BATADV_TT_CLIENT_WIFI ? 'W' : '.'), + last_seen_secs, last_seen_msecs); } rcu_read_unlock(); }

1 0

[batman-adv] master: batman-adv: reduce local TT entry timeout to 10 minutes (736dcf6)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 736dcf6b27f6fcbcd3099cd9482a0b6f13bcf215 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 8 22:16:15 2012 +0100 batman-adv: reduce local TT entry timeout to 10 minutes The current timeout is set to one hour. However a client connected to the mesh network will always generate traffic. In the worst case it will send ARP requests every 4 or 5 minutes. On the other hand having a long timeout means storing dead entries for one hour leads to very big trans-tables containing useless clients. This patch reduces the timeout to 10 minutes Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 736dcf6b27f6fcbcd3099cd9482a0b6f13bcf215 main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 7b5fc99..bfae503 100644 --- a/main.h +++ b/main.h @@ -41,7 +41,7 @@ * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE */ #define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */ -#define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in milliseconds */ +#define BATADV_TT_LOCAL_TIMEOUT 600000 /* in milliseconds */ #define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */ #define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */ #define BATADV_DAT_ENTRY_TIMEOUT (5*60000) /* 5 mins in milliseconds */

1 0

[batman-adv] master: batman-adv: Do not add multicast MAC addresses to translation table (9868989)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 9868989393a9a99b9dc33bbcd588ad997d300ffa Author: Linus Lüssing <linus.luessing(a)web.de> Date: Wed Oct 17 15:07:35 2012 +0200 batman-adv: Do not add multicast MAC addresses to translation table The current translation table mechanism is not suitable for multicast addresses and we are currently flooding such frames anyway. Therefore this patch prevents multicast MAC addresses being added to the translation table. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 9868989393a9a99b9dc33bbcd588ad997d300ffa soft-interface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 54800c7..8000639 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -180,7 +180,8 @@ static int batadv_interface_tx(struct sk_buff *skb, goto dropped; /* Register the client MAC in the transtable */ - batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); + if (!is_multicast_ether_addr(ethhdr->h_source)) + batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); /* don't accept stp packets. STP does not help in meshes. * better use the bridge loop avoidance ...

1 0

[batman-adv] master: batman-adv: use per_cpu_add helper (f8b19e1)
by postmaster＠open-mesh.org 13 Nov '12

13 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f8b19e13d8d8b233384d723ee2b2b54d011fb90c Author: Shan Wei <davidshan(a)tencent.com> Date: Tue Nov 13 09:53:26 2012 +0800 batman-adv: use per_cpu_add helper this_cpu_add is an atomic operation. and be more faster than per_cpu_ptr operation. Signed-off-by: Shan Wei <davidshan(a)tencent.com> Reviewed-by: Christoph Lameter <cl(a)linux.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- f8b19e13d8d8b233384d723ee2b2b54d011fb90c compat.h | 9 +++++++++ main.h | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/compat.h b/compat.h index be685aa..8780b43 100644 --- a/compat.h +++ b/compat.h @@ -62,6 +62,15 @@ #define skb_iif iif +#define this_cpu_add(x, c) batadv_this_cpu_add(&(x), c) + +static inline void batadv_this_cpu_add(uint64_t *count_ptr, size_t count) +{ + int cpu = get_cpu(); + *per_cpu_ptr(count_ptr, cpu) += count; + put_cpu(); +} + #endif /* < KERNEL_VERSION(2, 6, 33) */ diff --git a/main.h b/main.h index ec9c5ad..7b5fc99 100644 --- a/main.h +++ b/main.h @@ -279,9 +279,7 @@ static inline bool batadv_has_timed_out(unsigned long timestamp, static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, size_t count) { - int cpu = get_cpu(); - per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count; - put_cpu(); + this_cpu_add(bat_priv->bat_counters[idx], count); } #define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1)

1 0

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

13 Nov '12

The annotated tag, batman-adv-for-davem has been updated to cef0b3be8e9db9ef03a4e90755c0b73be71185ce (tag) from 3863ad19bda3443d3b6f4715402137bc9b713962 (which is now obsolete) tagging 153f5177b998c04c8459bc591cd4e5204fe66a1c (commit) replaces v3.7-rc3 tagged by Antonio Quartulli on Tue Nov 13 10:07:30 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) iEYEABECAAYFAlCiDdcACgkQpGgxIkP9cwfGngCdHWM+ArWKZbWv89n+PMMBcoCi vjYAn2ONwlUrf5M06AYry31y96ELSStC =llA2 -----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

← 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