commits June 2012

commits@lists.open-mesh.org

1 participants
236 discussions

batman-adv; branch, next, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the next branch: commit db014029c8a340a628be7cf47c29dc117a88e857 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Apr 18 17:15:57 2012 +0800 batman-adv: avoid characters requiring shell escapes in protocol names Reported-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index f753e58..2b48b82 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1240,7 +1240,7 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, } static struct bat_algo_ops batman_iv __read_mostly = { - .name = "BATMAN IV", + .name = "BATMAN_IV", .bat_iface_enable = bat_iv_ogm_iface_enable, .bat_iface_disable = bat_iv_ogm_iface_disable, .bat_iface_update_mac = bat_iv_ogm_iface_update_mac, diff --git a/main.c b/main.c index 5a193f5..170f65f 100644 --- a/main.c +++ b/main.c @@ -40,7 +40,7 @@ * list traversals just rcu-locked */ struct list_head hardif_list; static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *); -char bat_routing_algo[20] = "BATMAN IV"; +char bat_routing_algo[20] = "BATMAN_IV"; static struct hlist_head bat_algo_list; unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the next branch: commit 1aee9b47eab62668ded02ed09f6f12c0d67e3c8a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Apr 18 17:16:39 2012 +0800 batman-adv: ignore trailing CR when comparing protocol names Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/main.c b/main.c index 170f65f..25c2e2b 100644 --- a/main.c +++ b/main.c @@ -380,14 +380,19 @@ int bat_algo_seq_print_text(struct seq_file *seq, void *offset) static int param_set_ra(const char *val, const struct kernel_param *kp) { struct bat_algo_ops *bat_algo_ops; + char *algo_name = (char *)val; + size_t name_len = strlen(algo_name); - bat_algo_ops = bat_algo_get((char *)val); + if (algo_name[name_len - 1] == '\n') + algo_name[name_len - 1] = '\0'; + + bat_algo_ops = bat_algo_get(algo_name); if (!bat_algo_ops) { - pr_err("Routing algorithm '%s' is not supported\n", val); + pr_err("Routing algorithm '%s' is not supported\n", algo_name); return -EINVAL; } - return param_set_copystring(val, kp); + return param_set_copystring(algo_name, kp); } static const struct kernel_param_ops param_ops_ra = { -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the next branch: commit 7d256a1ff01e698d544c98847affd604128024fb Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Apr 14 13:15:26 2012 +0200 batman-adv: convert bat_priv->tt_crc from atomic_t to uint16_t In the code we neever need to atomically check and set the bat_priv->tt_crc field value. It is simply set and read once in different pieces of the code. Therefore this field can be safely be converted from atomic_t to uint16_t. Reported-by: Al Viro <viro(a)ZenIV.linux.org.uk> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 994369d..ed743a4 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -576,8 +576,7 @@ static void bat_iv_ogm_schedule(struct hard_iface *hard_iface, htonl((uint32_t)atomic_read(&hard_iface->seqno)); batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn); - batman_ogm_packet->tt_crc = htons((uint16_t) - atomic_read(&bat_priv->tt_crc)); + batman_ogm_packet->tt_crc = htons(bat_priv->tt_crc); if (tt_num_changes >= 0) batman_ogm_packet->tt_num_changes = tt_num_changes; diff --git a/send.c b/send.c index 815cc9c..cebc14a 100644 --- a/send.c +++ b/send.c @@ -112,7 +112,7 @@ static int prepare_packet_buffer(struct bat_priv *bat_priv, realloc_packet_buffer(hard_iface, new_len); - atomic_set(&bat_priv->tt_crc, tt_local_crc(bat_priv)); + bat_priv->tt_crc = tt_local_crc(bat_priv); /* reset the sending counter */ atomic_set(&bat_priv->tt_ogm_append_cnt, TT_OGM_APPEND_MAX); diff --git a/types.h b/types.h index 15f538a..995e910 100644 --- a/types.h +++ b/types.h @@ -224,7 +224,7 @@ struct bat_priv { spinlock_t vis_list_lock; /* protects vis_info::recv_list */ atomic_t num_local_tt; /* Checksum of the local table, recomputed before sending a new OGM */ - atomic_t tt_crc; + uint16_t tt_crc; unsigned char *tt_buff; int16_t tt_buff_len; spinlock_t tt_buff_lock; /* protects tt_buff */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the next branch: commit 0ba5f83e3a1157e2db07ba5ead0e64346ba1aaf8 Merge: 7d256a1ff01e698d544c98847affd604128024fb 18731af1b18d8b7f9fcbddadd08654ff977510f3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 17 10:35:27 2012 +0200 Merge branch 'next' -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the next branch: commit ec41a80a2b758eef6097907469f04678d5dba5e9 Merge: 0ba5f83e3a1157e2db07ba5ead0e64346ba1aaf8 7c8dbf5681006dabdee7721152bc50f62647c67c Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 17 10:49:33 2012 +0200 Merge branch 'next' -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the next branch: commit b0f3829d152db3dd98d0bcd894762e4a5788b135 Merge: ec41a80a2b758eef6097907469f04678d5dba5e9 a93ba67e47ca932246ee1b5cfbd8d0e333549a55 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 17 13:24:05 2012 +0200 Merge branch 'next' -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the next branch: commit 74b84f460614c6b04fc8e06083edc7af4ef1e7dd Merge: b0f3829d152db3dd98d0bcd894762e4a5788b135 a9f3b78bd28a3f876fc5ecbb1e0d65ff965f5f1e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Apr 18 17:28:02 2012 +0800 Merge branch 'next' diff --combined bat_iv_ogm.c index ed743a4,2a1845e..095aa64 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@@ -58,12 -58,12 +58,12 @@@ out static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; - unsigned long random_seqno; - int res = -1; + uint32_t random_seqno; + int res = -ENOMEM; /* randomize initial seqno to avoid collision */ - get_random_bytes(&random_seqno, sizeof(unsigned long)); - atomic_set(&hard_iface->seqno, (uint32_t)random_seqno); + get_random_bytes(&random_seqno, sizeof(random_seqno)); + atomic_set(&hard_iface->seqno, random_seqno); hard_iface->packet_len = BATMAN_OGM_HLEN; hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC); @@@ -576,7 -576,8 +576,7 @@@ static void bat_iv_ogm_schedule(struct htonl((uint32_t)atomic_read(&hard_iface->seqno)); batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn); - batman_ogm_packet->tt_crc = htons((uint16_t) - atomic_read(&bat_priv->tt_crc)); + batman_ogm_packet->tt_crc = htons(bat_priv->tt_crc); if (tt_num_changes >= 0) batman_ogm_packet->tt_num_changes = tt_num_changes; -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the master branch: commit 792ecdf05290ec8cfd1f7c5e69bd891be0995a34 Merge: 86b9780b49f721e248ce8a9a8da99e317ef08baf b82d11e243ec144c515e7d04e8e8c31b111a060d Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 12 18:31:46 2012 +0200 Merge tag 'v2012.2.0' batman-adv 2012.2.0 diff --combined README.external index 8739bca,0a38d90..e032ef1 --- a/README.external +++ b/README.external @@@ -6,7 -6,7 +6,7 @@@ and as external module. The external m new features without upgrading to a newer kernel version and to get batman-adv specific bugfixes for kernels that are not supported anymore. It compiles against and should work - with Linux 2.6.29 - 3.4. Supporting older versions is not + with Linux 2.6.29 - 3.5. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) @@@ -21,7 -21,7 +21,7 @@@ if you want to compile against some oth # make KERNELPATH=/path/to/kernel -if you wont to install this module: +if you want to install this module: # sudo make install @@@ -29,7 -29,7 +29,7 @@@ CONFIGURATIO ------------- The in-kernel module can be configured through -menuconfig. When compiling outside of the kernel, tree it is +menuconfig. When compiling outside of the kernel tree, it is necessary to configure it using the make options. Each option can be set to to y (enabled), n (disabled) or m (build as module). Available options and their possible values are -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the master branch: commit c3c748339f605c034bac3317a93e10fc0f8d1d0a Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 12 18:32:53 2012 +0200 batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index a229190..e76f9c6 100644 --- a/main.h +++ b/main.h @@ -26,7 +26,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2012.2.0" +#define BATADV_SOURCE_VERSION "2012.3.0" #endif /* B.A.T.M.A.N. parameters */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.2.0-121-gc3c7483
by postmaster＠open-mesh.org 12 Jun '12

12 Jun '12

The following commit has been merged in the next branch: commit 2c9aa3b4c37bd55148f5f25212c89e7bf5f28497 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 29 12:38:20 2012 +0200 batman-adv: Initialize lockdep class keys for hashes The hash for claim and backbone hash in the bridge loop avoidance code receive the same key because they are getting initialized by hash_new with the same key. Lockdep will create a backtrace when they are used recursively. This can be avoided by reinitializing the key directly after the hash_new. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index aaa4b9f..96a943e 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1125,6 +1125,14 @@ out: bla_start_timer(bat_priv); } +/* The hash for claim and backbone hash receive the same key because they + * are getting initialized by hash_new with the same key. Reinitializing + * them with to different keys to allow nested locking without generating + * lockdep warnings + */ +static struct lock_class_key claim_hash_lock_class_key; +static struct lock_class_key backbone_hash_lock_class_key; + /* initialize all bla structures */ int bla_init(struct bat_priv *bat_priv) { @@ -1159,6 +1167,10 @@ int bla_init(struct bat_priv *bat_priv) bat_priv->claim_hash = hash_new(128); bat_priv->backbone_hash = hash_new(32); + hash_set_lock_class(bat_priv->claim_hash, &claim_hash_lock_class_key); + hash_set_lock_class(bat_priv->backbone_hash, + &backbone_hash_lock_class_key); + if (!bat_priv->claim_hash || !bat_priv->backbone_hash) return -1; diff --git a/hash.c b/hash.c index 117687b..4578c20 100644 --- a/hash.c +++ b/hash.c @@ -69,3 +69,11 @@ free_hash: kfree(hash); return NULL; } + +void hash_set_lock_class(struct hashtable_t *hash, struct lock_class_key *key) +{ + uint32_t i; + + for (i = 0 ; i < hash->size; i++) + lockdep_set_class(&hash->list_locks[i], key); +} diff --git a/hash.h b/hash.h index d4bd786..7bcb98f 100644 --- a/hash.h +++ b/hash.h @@ -45,6 +45,9 @@ struct hashtable_t { /* allocates and clears the hash */ struct hashtable_t *hash_new(uint32_t size); +/* set class key for all locks */ +void hash_set_lock_class(struct hashtable_t *hash, struct lock_class_key *key); + /* free only the hashtable and the hash itself. */ void hash_destroy(struct hashtable_t *hash); -- batman-adv

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2012