commits January 2012

commits@lists.open-mesh.org

1 participants
17 discussions

linux integration; annotated tag, v3.3-rc2, created. v3.3-rc2
by postmaster＠open-mesh.org 31 Jan '12

31 Jan '12

The annotated tag, v3.3-rc2 has been created at 8bd4e2a2ba139fcdab2ab9bbdd76e4df4d66d7fd (tag) tagging 62aa2b537c6f5957afd98e29f96897419ed5ebab (commit) replaces v3.3-rc1 tagged by Linus Torvalds on Tue Jan 31 13:32:09 2012 -0800 - Shortlog ------------------------------------------------------------ Linux 3.3-rc2 .. several days delayed. No reason, I just didn't think of it. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPKF4KAAoJEHm+PkMAQRiGw/YH+wXg2DpZUuHeBK52zMGlJBPc DzX11/Uan3Y07gM0JbDzuVxwjX4vdxR2bV6r1qsLP8JEUnE8jyFC32DBGi5WAht7 F4KU/Uov2Ds5/wzvY4Iuo01C+JftQHXuy/Sbhck1d0LI0yjLejRaw+zuJv0x2/eS 7YqV+KTGE1lDuJs/Gyq1Vqr1g9831AuS1tv/g3gaqBuN6TcPBFCocaVxzwrUc+y6 94h26XbbOhQRIz38oqUkiqAGnvYS61ocyBcEiRHf0dXkNSDIINqlgukvd7YTXouA jj/w/DWpMRcQuYAgqkrurr9+yWC9hVQcsvvQ5sAQnIPcxoR868sg1pO8Oheq+1g= =kUzV -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2011.4.0-64-ge4172b0
by postmaster＠open-mesh.org 26 Jan '12

26 Jan '12

The following commit has been merged in the master branch: commit e4172b0c922f6b4242e1e64789c47bd30afc55e9 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 19:40:40 2012 +0100 batman-adv: fix initialised flag for tt request/responses When receiving a tt_response, we first delete the old entries and set the initialised flag to false, then add the new received entries, but forgot to set the initialised flag to true again. This may lead to endless loops of requests/responses, as a request is always issued if the initialised flag is not set. This is a regression introduced by 8ef201e01c57e3bfbcb7f6db69405ff259c2b907. Fix this by moving initialised = true from tt_update_changes() to _tt_update_changes(). Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/translation-table.c b/translation-table.c index 27753a0..9a6f315 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1434,6 +1434,7 @@ static void _tt_update_changes(struct bat_priv *bat_priv, */ return; } + orig_node->tt_initialised = true; } static void tt_fill_gtable(struct bat_priv *bat_priv, @@ -1476,7 +1477,6 @@ static void tt_update_changes(struct bat_priv *bat_priv, tt_save_orig_buffer(bat_priv, orig_node, (unsigned char *)tt_change, tt_num_changes); atomic_set(&orig_node->last_ttvn, ttvn); - orig_node->tt_initialised = true; } bool is_my_client(struct bat_priv *bat_priv, const uint8_t *addr) -- batman-adv

1 0

batctl; branch, master, updated. v2011.4.0-12-ga9425b9
by postmaster＠open-mesh.org 26 Jan '12

26 Jan '12

The following commit has been merged in the master branch: commit a9425b909950ec901a4677a4ca971ee4f836e7e6 Merge: d9ee7eed3175992be75e2cb949c048bdddeb0769 b320bf27babb12833777c8cc5e112c6ff18d42c4 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Jan 27 03:45:55 2012 +0800 Merge branch 'next' diff --combined sys.c index 9cdccba,27f144a..0263ae7 --- a/sys.c +++ b/sys.c @@@ -1,5 -1,5 +1,5 @@@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * @@@ -187,7 -187,7 +187,7 @@@ static void log_level_usage(void int handle_loglevel(char *mesh_iface, int argc, char **argv) { - int optchar, res; + int optchar, res = EXIT_FAILURE; int log_level = 0; char *path_buff; char str[4]; @@@ -221,8 -221,10 +221,10 @@@ log_level |= (1 << 1); else if (strcmp(argv[i], "tt") == 0) log_level |= (1 << 2); - else + else { log_level_usage(); + goto out; + } } snprintf(str, sizeof(str), "%i", log_level); -- batctl

1 0

batctl; branch, next, updated. v2011.4.0-7-gb320bf2
by postmaster＠open-mesh.org 26 Jan '12

26 Jan '12

The following commit has been merged in the next branch: commit b320bf27babb12833777c8cc5e112c6ff18d42c4 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 19:31:03 2012 +0100 batctl: exit on parse error in batctl ll If the argument could not be understood, we should not try to apply something, but return from the function. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/sys.c b/sys.c index 105bb51..27f144a 100644 --- a/sys.c +++ b/sys.c @@ -187,7 +187,7 @@ static void log_level_usage(void) int handle_loglevel(char *mesh_iface, int argc, char **argv) { - int optchar, res; + int optchar, res = EXIT_FAILURE; int log_level = 0; char *path_buff; char str[4]; @@ -221,8 +221,10 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= (1 << 1); else if (strcmp(argv[i], "tt") == 0) log_level |= (1 << 2); - else + else { log_level_usage(); + goto out; + } } snprintf(str, sizeof(str), "%i", log_level); -- batctl

1 0

linux integration; branch, for_david, deleted. for_net-next_20111126
by postmaster＠open-mesh.org 20 Jan '12

20 Jan '12

The branch, for_david has been deleted was 76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 ----------------------------------------------------------------------- 76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 batman-adv: Fix range check for expected packets ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, v3.3-rc1, created. v3.3-rc1
by postmaster＠open-mesh.org 20 Jan '12

20 Jan '12

The annotated tag, v3.3-rc1 has been created at 0803b590443c714345e41c77b6e2f1d6c92243ec (tag) tagging dcd6c92267155e70a94b3927bce681ce74b80d1f (commit) replaces v3.2 tagged by Linus Torvalds on Thu Jan 19 15:04:57 2012 -0800 - Shortlog ------------------------------------------------------------ Linux 3.3-rc1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPGKGqAAoJEHm+PkMAQRiGNJMH/3U15Z+w6sA8FUdrZtKmgBCQ HK2aD5gpLarnKctciVHA2rdWeggiROK5ut+FTG+oKwiC2vicHWuxRg0J0M66xRlJ MbvffdZqLjoTpsSzWeISUTrLvYDWnFYZggsT8G7+N7mzuJzHh0TzDbcytRlz9dI2 EdQ5cMKWB053rDAKkyXPqcwGBkqgggrhbabFXklKOHzIUzOG//gAKmGRXbZeIAhJ Rt09kdj0blHYUqzc8NOk5SoMQTBh4cqRTN0XlQMcMzSSuwj9RwmN9Kihub4S8hB+ qF2SuLvRlcpRabGEFUT4MTLjr1KD+9uFsBn6hYWne7Mq8x+uClC5A1ZDPMWOpn4= =42Bc -----END PGP SIGNATURE----- Antonio Quartulli (8): batman-adv: tt_global_del_orig() has to print the correct message batman-adv: use orig_hash_find() instead of get_orig_node() in TT code batman-adv: fixed hash functions type to uint32_t instead of int batman-adv: linearise the tt_response skb only if needed batman-adv: check for tt_reponse packet real length batman-adv: create a common substructure for tt_global/local_entry batman-adv: generalise tt_local_reset_flags() batman-adv: format multi-line if in the correct way Dan Carpenter (1): batman-adv: remove extra negation in gw_out_of_range() David S. Miller (2): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net batman-adv: Fix merge error. Marek Lindner (2): batman-adv: refactoring gateway handling code batman-adv: report compat_version in version field in case of version mismatch Paul Kot (1): batman-adv: bat_socket_read missing checks Simon Wunderlich (4): batman-adv: directly write tt entries without buffering batman-adv: Fix range check for expected packets batman-adv: check return value for hash_add() batman-adv: use unregister_netdevice() when softif_create fails Sven Eckelmann (4): batman-adv: update internal version number batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo> batman-adv: Directly check read of icmp packet in copy_from_user batman-adv: Only write requested number of byte to user buffer ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2011.4.0-63-ge40ea15
by postmaster＠open-mesh.org 15 Jan '12

15 Jan '12

The following commit has been merged in the master branch: commit e40ea1503eef99e779a46e3197a94c56aab4fb49 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jan 12 19:07:00 2012 +0100 batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry Actually the TT_CLIENT_PENDING flag is never set in the tt_global_entry structure, therefore this code is useless and can be removed. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index d105cbd..27753a0 100644 --- a/translation-table.c +++ b/translation-table.c @@ -603,7 +603,7 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) struct tt_global_entry, common); seq_printf(seq, " * %pM (%3u) via %pM (%3u) " - "[%c%c%c]\n", + "[%c%c]\n", tt_global_entry->common.addr, tt_global_entry->ttvn, tt_global_entry->orig_node->orig, @@ -613,8 +613,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) (tt_global_entry->common.flags & TT_CLIENT_ROAM ? 'R' : '.'), (tt_global_entry->common.flags & - TT_CLIENT_PENDING ? 'X' : '.'), - (tt_global_entry->common.flags & TT_CLIENT_WIFI ? 'W' : '.')); } rcu_read_unlock(); @@ -838,11 +836,6 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv, if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount)) goto out; - /* A global client marked as PENDING has already moved from that - * originator */ - if (tt_global_entry->common.flags & TT_CLIENT_PENDING) - goto out; - orig_node = tt_global_entry->orig_node; out: -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.4.0-62-g4ead48d
by postmaster＠open-mesh.org 08 Jan '12

08 Jan '12

The following commit has been merged in the master branch: commit 4ead48deb9e0cc3537f538b258e2769f035d68b3 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Jan 6 21:31:34 2012 +0100 batman-adv: code refactoring - move debug print into tt_local_set_pending Each tt_local_set_pending is always followed by a bat_dbg invocation. This can be simplified by moving the bat_dbg() call. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index b493ab4..d105cbd 100644 --- a/translation-table.c +++ b/translation-table.c @@ -355,7 +355,7 @@ out: static void tt_local_set_pending(struct bat_priv *bat_priv, struct tt_local_entry *tt_local_entry, - uint16_t flags) + uint16_t flags, const char *message) { tt_local_event(bat_priv, tt_local_entry->common.addr, tt_local_entry->common.flags | flags); @@ -364,6 +364,9 @@ static void tt_local_set_pending(struct bat_priv *bat_priv, * to be kept in the table in order to send it in a full table * response issued before the net ttvn increment (consistency check) */ tt_local_entry->common.flags |= TT_CLIENT_PENDING; + + bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: " + "%s\n", tt_local_entry->common.addr, message); } void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr, @@ -376,10 +379,7 @@ void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr, goto out; tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL | - (roaming ? TT_CLIENT_ROAM : NO_FLAGS)); - - bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: " - "%s\n", tt_local_entry->common.addr, message); + (roaming ? TT_CLIENT_ROAM : NO_FLAGS), message); out: if (tt_local_entry) tt_local_entry_free_ref(tt_local_entry); @@ -417,10 +417,7 @@ static void tt_local_purge(struct bat_priv *bat_priv) continue; tt_local_set_pending(bat_priv, tt_local_entry, - TT_CLIENT_DEL); - bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) " - "pending to be removed: timed out\n", - tt_local_entry->common.addr); + TT_CLIENT_DEL, "timed out"); } spin_unlock_bh(list_lock); } -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.4.0-61-g5c5fa22
by postmaster＠open-mesh.org 08 Jan '12

08 Jan '12

The following commit has been merged in the master branch: commit 5c5fa228037210616cb17c969bcaea2e0d7d310a Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Jan 6 21:31:33 2012 +0100 batman-adv: set TT_CLIENT_NEW flag before invoking hash_add() In case of a new tt_local_entry, the TT_CLIENT_NEW flag has to be set before adding such entry to the hash table. Otherwise, it opens a race condition in which the entry can be found but the flag has not been set. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index 7ea4c42..b493ab4 100644 --- a/translation-table.c +++ b/translation-table.c @@ -210,6 +210,11 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (compare_eth(addr, soft_iface->dev_addr)) tt_local_entry->common.flags |= TT_CLIENT_NOPURGE; + /* The local entry has to be marked as NEW to avoid to send it in + * a full table response going out before the next ttvn increment + * (consistency check) */ + tt_local_entry->common.flags |= TT_CLIENT_NEW; + hash_added = hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig, &tt_local_entry->common, &tt_local_entry->common.hash_entry); @@ -222,11 +227,6 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, tt_local_event(bat_priv, addr, tt_local_entry->common.flags); - /* The local entry has to be marked as NEW to avoid to send it in - * a full table response going out before the next ttvn increment - * (consistency check) */ - tt_local_entry->common.flags |= TT_CLIENT_NEW; - /* remove address from global hash if present */ tt_global_entry = tt_global_hash_find(bat_priv, addr); -- batman-adv

1 0

linux integration; annotated tag, v3.2, created. v3.2
by postmaster＠open-mesh.org 05 Jan '12

05 Jan '12

The annotated tag, v3.2 has been created at d018bf5252f1041f8839022e3ab38a1bc40d3868 (tag) tagging 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (commit) replaces v3.2-rc7 tagged by Linus Torvalds on Wed Jan 4 15:55:50 2012 -0800 - Shortlog ------------------------------------------------------------ Linux 3.2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPBOcQAAoJEHm+PkMAQRiG55UH/ibkoyesorxV998bDzyb8eX3 Y5+v/q8gdC27fGBmTOdROeGelxNafn/Ryr74aHY62VkuIWXfoL9vWD3ehCOKBcgV 7krvEAvtUu6W1oxdGNLemTCAy4G9pjlnipW1I6yVz+MQe/3oGdNIjPgeUhcq87EM oEHnhWxuvLMere98m8qG4uUnzpPWIN2fIR00eRW9wx/DuquN/351AvcdAqV8UZFl UtlO+geZgB4xl5nqo3AmEsZK2kVZ7/Hlqb8feXqOWg81cJiZEgeW1ZfyIObPc4z+ diUBSGY8LSnkM9ZH4I2aGj+ycamlzTNJd6GVQ4gI+TVsjf9j6p/0UsyqiE076K8= =T+90 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2012