commits June 2011

commits@lists.open-mesh.org

1 participants
58 discussions

batctl; annotated tag, v2011.2.0, created. v2011.2.0
by postmaster＠open-mesh.org 19 Jun '11

19 Jun '11

The annotated tag, v2011.2.0 has been created at 08afbadcad17cad29df5612ecb248c0356b23f54 (tag) tagging b929422071da1bcea5c7b3185b376c664d19ad58 (commit) replaces v2011.1.0 tagged by Sven Eckelmann on Sun Jun 19 20:24:43 2011 +0200 - Shortlog ------------------------------------------------------------ batctl 2011.2.0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJN/j7rAAoJEF2HCgfBJntG8gQQAM4ROeuA3yqzCgSSMfihC7c9 XoI0DFnfKW3oSDLk35EYEYfOJx2OuhYd/pMAICiUlXBD8YuAy5YR/yPLtILGmBrg hmewaIRfMgoMRf7hRjvIUcE+7C/ECHwdW1oiEJRDCHuUShJUI1srR8bzTPU6m0nz SxPZsv+/y5BEDcuw4N75BvLv+LYGv1v8LDp+Q7C59ewvhN4IPF7mZEcWi/GRqS9E /PfcnTU29Nf4+cpUA73Tm2s0dzcREno+y5ZEMkWUJrEmcx1qh3RacJdg1ynvWNcC f2ADT7VLhLUQ6uZwk/D9A33JSee1rCKWXy6n/+H3jkVciUeoz3W9aU2lZ9qXmwxn vWHWyp3wDTOK09Ld35Bjq+vxIC4unVW4I5TAwXUwvquBmNPfldhtL2NovkuI9uEx NIvXRp1yXIWmBH/ScJA7Vgkdgb/SHe3TeTHEYFJMuN9rQdR/BfEL1dqSEN4A23+Z qRNib4XV0jTrafzo8Q1dwKIiZSyoI8PwIjMgxkUb640BWB7QEC6qCn7VXoqlXHsr cgWFCIIuUo/JM3U5bG9vHTrhLO6EUuQnolTvhGMgUAO0Ohe/HngCjxPpoRq2Fq2t OTT1E8tZI9O0bwLsNGrmhgjwDN504kxVzDILhqaQYkeVd+hk+rhmxloBWc4wXs1x D/sJoZQz7/C3Fk0A89u+ =yKgH -----END PGP SIGNATURE----- Antonio Quartulli (1): batctl: rename stuff from *hna* to *tt* (translation table) Sven Eckelmann (7): Merge commit 'v2011.1.0' batctl: Start new development cycle batctl: Fix JSON object output batctl: Fix JSON object output batctl: Remove multiline comments from line ending Merge branch 'master' into next batctl: update version for release ----------------------------------------------------------------------- -- batctl

1 0

batman-adv; annotated tag, v2011.2.0, created. v2011.2.0
by postmaster＠open-mesh.org 19 Jun '11

19 Jun '11

The annotated tag, v2011.2.0 has been created at 7601fec63d5ef16779e665d7949faafe0ad1c00d (tag) tagging 885c663956e419e7a72419681766d339262bb50c (commit) replaces v2011.1.0 tagged by Sven Eckelmann on Sun Jun 19 20:24:55 2011 +0200 - Shortlog ------------------------------------------------------------ batman-adv 2011.2.0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJN/j73AAoJEF2HCgfBJntGapYP/i4UBFOgS9Cv9dV/q85UqpHW 4ddUpk99nCiD3diLRUtyjAiFO7wiFbmQPhuY4jor8RjWrltrAUpVmlZha4bgWHx8 x90XhNjC5zqzw9BIIgDdfk9nQj02ESDIfZJMtK5DsZlPuNmwamBr3EHDEx5L8Cz4 AqGsiJ4xogadT+MQ22GlfX+eIcICCuyUlMvj8b2C2pjV3716VkVe25Bv1LHpi3BY PEZxo8/aFG2S5levJTxkln3TqVQ3wPPRlO/E8ivLZYXYMtRH4pGA0k+LkoAacuQN yac7YSZSflqEVEfQz9hvRLkzAz1wMJy4Y/UvYUNRo85x5TRI9HP60bNGP2f8KVUi YKdByRXeON3XedFsmhunelZeD+/nBIPxSS+sulT1IExn6MxLvcnjqNGZ6fQtOQkb ApcJbc6R0qYRC4ylE0gPOXrGtjG9S9RFf/zGBYrMqD+bG/p4Z25NSxhFXz7+xqr5 3ktG1WJ3+QmGzqec5Q7ygV9XTJDI8ZKhlxh66oEJFnLCNhf1lgIOuFY5H+Eiobk6 1T0cpLvQVEuXreTCV08iHM0DMSa7Q83oSJTtePqKAoE+wwC9nRUANrx5AdeVLFEn +hr0xqU1j4cUeacco64/1TEV7eGQdcVvtn9ExkaFd9XH0p1aQYTfCaT7r/rA+0ca HGp66yQkyCnQNMTKZjtR =6uK3 -----END PGP SIGNATURE----- Andrew Lunn (1): batman-adv: Set the txqueuelen to zero when creating soft interface. Antonio Quartulli (7): batman-adv: Modifing hna_local_fill_buffer() return value batman-adv: orig_node must be freed after in case of timeout batman-adv: orig_hash_find() manages rcu_lock/unlock internally batman-adv: Move definition of atomic_dec_not_zero() into main.h batman-adv: fix gw_node_update() and gw_election() batman-adv: rename everything from *hna* into *tt* (translation table) batman-adv: correct kobject_set_name() arguments Daniele Furlan (1): batman-adv: remove duplicate code from function is_bidirectional_neigh() David Decotigny (1): batman-adv: cosmetic: Use ethtool ethtool_cmd_speed API Jesper Juhl (2): Even Batman should not dereference NULL pointers Batman: Remove two duplicate includes. Linus Lüssing (14): batman-adv: Fix kernel panic when fetching vis data on a vis server batman-adv: Remove duplicate types.h inclusions batman-adv: Switch order of types.h and compat.h inclusion batman-adv: Disallow originator addressing within mesh layer batman-adv: Make bat_priv->curr_gw an rcu protected pointer batman-adv: add __rcu annotations for gw_node batman-adv: Increase orig_node refcount before releasing rcu read lock batman-adv: Fix possible buffer overflow in softif neigh list output batman-adv: Remove unused hdr_size variable in route_unicast_packet() batman-adv: Move bonding / iface alternating router search to own functions batman-adv: Make gateway_get_selected type safe batman-adv: Simplify gw_check_election(), use gw_get_selected() batman-adv: Make orig_node->router an rcu protected pointer batman-adv: Protect global TQ window with a spinlock Lucas De Marchi (1): batman-adv: Fix common misspellings Marek Lindner (29): batman-adv: remove hash resize functions batman-adv: protect neighbor nodes with reference counters batman-adv: convert neighbor list to hlist batman-adv: protect neighbor list with rcu locks batman-adv: adjust NULL pointer check style batman-adv: free neighbors when an interface is deactivated batman-adv: protect neigh_nodes used outside of rcu_locks with refcounting batman-adv: protect each hash row with rcu locks batman-adv: protect originator nodes with reference counters batman-adv: protect ogm counter arrays with spinlock batman-adv: remove orig_hash spinlock batman-adv: protect bit operations to count OGMs with spinlock batman-adv: make broadcast seqno operations atomic batman-adv: Correct rcu refcounting for gw_node batman-adv: Correct rcu refcounting for softif_neigh batman-adv: Correct rcu refcounting for batman_if batman-adv: Correct rcu refcounting for neigh_node batman-adv: separate ethernet comparing calls from hash functions batman-adv: remove extra layer between hash and hash element - hash bucket batman-adv: Correct rcu refcounting for orig_node batman-adv: increase refcount in create_neighbor to be consistent batman-adv: rename global if_list to hardif_list batman-adv: rename batman_if struct to hard_iface batman-adv: concentrate all curr_gw related rcu operations in select/deselect functions batman-adv: Make bat_priv->primary_if an rcu protected pointer batman-adv: remove misplaced comment batman-adv: multi vlan support for bridge loop detection batman-adv: Fix refcount imbalance in find_router batman-adv: reset broadcast flood protection on error Michał Mirosław (2): batman-adv: remove rx_csum ethtool_ops net: batman-adv: remove rx_csum ethtool_ops Paul E. McKenney (3): batman-adv: convert call_rcu(gw_node_free_rcu) to kfree_rcu batman-adv: convert call_rcu(neigh_node_free_rcu) to kfree() batman-adv: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu Simon Wunderlich (3): batman-adv: remove unused parameters batman-adv: protect bonding with rcu locks batman-adv: protect softif_neigh by rcu Sven Eckelmann (46): batman-adv: Rename if_list_queue to if_queue batman-adv: Remove hash_iterate batman-adv: Use kernel facilities for bit operations batman-adv: Remove line over 80 characters batman-adv: Remove TYPE_OF_WORD define batman-adv: Use "__attribute__" shortcut macros batman-adv: Mark bucket_free_orig_rcu as static batman-adv: Silence checkpatch warnings about spinlocks batman-adv: Create roughly equal sized fragments batman-adv: Calculate correct size for merged packets batman-adv: Remove dangling declaration of hash_remove_element batman-adv: Remove unused definitions batman-adv: Remove declaration of batman_skb_recv batman-adv: Remove unused variables batman-adv: Remove vis info on hashing errors batman-adv: Remove vis info element in free_info batman-adv: Make vis info stack traversal threadsafe batman-adv: Update copyright years batman-adv: Merge batman-adv 2011.0.0 batman-adv: Linearize fragment packets before merge batman-adv: Split combined variable declarations batman-adv: Use successive sequence numbers for fragments batman-adv: else should follow close brace '}' batman-adv: Disallow regular interface as mesh device batman-adv: Remove subversion/svk revision information batman-adv: Add missing static for softif_neigh_deselect batman-adv: Fix imbalanced locking in gw_node_update Merge commit 'v2011.1.0' batman-adv: Start new development cycle Merge branch 'master' into next batman-adv: Remove unnecessary hardif_list_lock batman-adv: Avoid deadlock between rtnl_lock and s_active batman-adv: Fix rcu_lock imbalance in softif_neigh_get batman-adv: Rename bat_printk.c to compat.c batman-adv: Fix line over 80 characters batman-adv: Don't include bat_sysfs.h in compat.h batman-adv: Remove unused variable r in bat_printk batman-adv: Remove multiline comments from line ending Merge branch 'master' into next batman-adv: Fix build with linux 2.6.25-2.6.27 batman-adv: Add missing hardif_free_ref in forw_packet_free batman-adv: Add compatibility code for kfree_rcu batman-adv: Use rcu_dereference_protected by update-side batman-adv: Update README for upcoming release batman-adv: Add some initial notes in CHANGELOG for upcoming release batman-adv: update version for release Sylvestre Ledru (1): batman-adv: fix minor typos/spelling ----------------------------------------------------------------------- -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.1.0-111-g885c663
by postmaster＠open-mesh.org 19 Jun '11

19 Jun '11

The following commit has been merged in the next branch: commit 83fb092e89ed9fa16eddba81b8b6293912dba83b Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 15 13:07:54 2011 +0200 batman-adv: Update README for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/README b/README index 22e799e..5482c45 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[state: 17-04-2011] +[state: 15-06-2011] BATMAN-ADV ---------- @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.21 - 2.6.39. Supporting +against and should work with Linux 2.6.21 - 3.0. 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. :-) -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.1.0-111-g885c663
by postmaster＠open-mesh.org 19 Jun '11

19 Jun '11

The following commit has been merged in the next branch: commit 5ba767a681e382e1fbaf714183371ff12f48f94f Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 15 14:32:18 2011 +0200 batman-adv: Add some initial notes in CHANGELOG for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/CHANGELOG b/CHANGELOG index 0ec425e..297adb0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,15 @@ +batman-adv 2011.2.0: + +* support latest kernels (2.6.21 - 3.0) +* cleanup of coding style +* rename of HNA to TT +* support for multi vlan in bridge loop detection +* many bug fixes (rcu protection of router/primary_if/softif_neigh, + race condition in TQ calculation, deadlock when creating new mesh + interfaces, ...) + + -- Sun, 19 Jun 2011 20:07:47 +0200 + batman-adv 2011.1.0: * support latest kernels (2.6.21 - 2.6.39) @@ -6,7 +18,7 @@ batman-adv 2011.1.0: * many bug fixes (fragmented packets linearisation, fragments numbering, verification of added interfaces, ...) - -- Sat, Sun, 17 Apr 2011 17:41:53 +0200 + -- Sun, 17 Apr 2011 17:41:53 +0200 batman-adv 2011.0.0: -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.1.0-111-g885c663
by postmaster＠open-mesh.org 19 Jun '11

19 Jun '11

The following commit has been merged in the next branch: commit 885c663956e419e7a72419681766d339262bb50c Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 15 13:06:46 2011 +0200 batman-adv: update version for release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index 6259acb..421d5ab 100644 --- a/main.h +++ b/main.h @@ -27,7 +27,7 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv" -#define SOURCE_VERSION "next" +#define SOURCE_VERSION "2011.2.0" /* B.A.T.M.A.N. parameters */ -- batman-adv

1 0

batctl; branch, next, updated. v2011.1.0-8-gb929422
by postmaster＠open-mesh.org 19 Jun '11

19 Jun '11

The following commit has been merged in the next branch: commit b929422071da1bcea5c7b3185b376c664d19ad58 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 19 20:11:04 2011 +0200 batctl: update version for release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index a9102b1..ddfcc7e 100644 --- a/main.h +++ b/main.h @@ -21,7 +21,7 @@ -#define SOURCE_VERSION "next" +#define SOURCE_VERSION "2011.2.0" #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket" -- batctl

1 0

batman-adv; branch, master, updated. v2011.1.0-161-g74db080
by postmaster＠open-mesh.org 17 Jun '11

17 Jun '11

The following commit has been merged in the master branch: commit 74db0801dd491805b1cfcbf3b0f35aaf8c3ada38 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Jun 16 12:33:10 2011 +0200 batman-adv: fix cleanup in send_tt_request() The ret variable was never set to any value other than 0, therefore the skb and tt_req_node would not be freed in case of an error. Furthermore, the code assumed tt_req_node being always a valid pointer by dereferencing it in the cleanup part. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index 373ee81..5f1fcd5 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1012,12 +1012,12 @@ out: int send_tt_request(struct bat_priv *bat_priv, struct orig_node *dst_orig_node, uint8_t ttvn, uint16_t tt_crc, bool full_table) { - struct sk_buff *skb; + struct sk_buff *skb = NULL; struct tt_query_packet *tt_request; struct neigh_node *neigh_node = NULL; struct hard_iface *primary_if; - struct tt_req_node *tt_req_node; - int ret = 0; + struct tt_req_node *tt_req_node = NULL; + int ret = 1; primary_if = primary_if_get_selected(bat_priv); if (!primary_if) @@ -1066,8 +1066,9 @@ out: neigh_node_free_ref(neigh_node); if (primary_if) hardif_free_ref(primary_if); - if (ret) { + if (ret) kfree_skb(skb); + if (ret && tt_req_node) { spin_lock_bh(&bat_priv->tt_req_list_lock); list_del(&tt_req_node->list); spin_unlock_bh(&bat_priv->tt_req_list_lock); -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-160-g6f0ff74
by postmaster＠open-mesh.org 16 Jun '11

16 Jun '11

The following commit has been merged in the master branch: commit 6f0ff747b7a61736eb40790eb4c279599d937672 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jun 16 00:32:25 2011 +0200 batman-adv: skbs have to be freed using kfree_skb() The skb structures have always to be freed using kfree_skb() and not the simple kfree() Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index adecf1b..373ee81 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1199,7 +1199,7 @@ out: if (primary_if) hardif_free_ref(primary_if); if (!ret) - kfree(skb); + kfree_skb(skb); return ret; } @@ -1312,7 +1312,7 @@ out: if (primary_if) hardif_free_ref(primary_if); if (!ret) - kfree(skb); + kfree_skb(skb); /* This packet was for me, so it doesn't need to be re-routed */ return true; } -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-159-gad0432c
by postmaster＠open-mesh.org 16 Jun '11

16 Jun '11

The following commit has been merged in the master branch: commit ad0432c68c59f0fb3cd22279fd8be5aaf1472ac1 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jun 16 00:32:24 2011 +0200 batman-adv: the skb has not to be freed in recv_roam_adv() In recv_roam_adv(), in case of error the skb is freed and then NET_RX_DROP is returned. This makes the caller function wrongly invoke kfree_skb() again. To avoid this double free recv_tt_query() has to always return NET_RX_DROP and not to free the skb. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/routing.c b/routing.c index 2222288..0ce090c 100644 --- a/routing.c +++ b/routing.c @@ -1259,7 +1259,6 @@ int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) struct roam_adv_packet *roam_adv_packet; struct orig_node *orig_node; struct ethhdr *ethhdr; - int ret = NET_RX_DROP; /* drop packet if it has not necessary minimum size */ if (unlikely(!pskb_may_pull(skb, sizeof(struct roam_adv_packet)))) @@ -1297,10 +1296,9 @@ int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) bat_priv->tt_poss_change = true; orig_node_free_ref(orig_node); - ret = NET_RX_SUCCESS; out: - kfree(skb); - return ret; + /* returning NET_RX_DROP will make the caller function kfree the skb */ + return NET_RX_DROP; } /* find a suitable router for this originator, and use -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-158-g307e22c
by postmaster＠open-mesh.org 15 Jun '11

15 Jun '11

The following commit has been merged in the master branch: commit 307e22c4603ad8bad66b031ac3e30b9e4e3e746b Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 15 15:17:21 2011 +0200 batman-adv: Keep interface_tx as local function interface_tx is not used outside of soft-interface.c and thus doesn't need to be declared inside soft-interface.h Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index ab420ea..2dcdbb7 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -554,7 +554,7 @@ static int interface_change_mtu(struct net_device *dev, int new_mtu) return 0; } -int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) +static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) { struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct bat_priv *bat_priv = netdev_priv(soft_iface); diff --git a/soft-interface.h b/soft-interface.h index c24906d..001546f 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -25,7 +25,6 @@ int my_skb_head_push(struct sk_buff *skb, unsigned int len); int softif_neigh_seq_print_text(struct seq_file *seq, void *offset); void softif_neigh_purge(struct bat_priv *bat_priv); -int interface_tx(struct sk_buff *skb, struct net_device *soft_iface); void interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct hard_iface *recv_if, int hdr_size); -- batman-adv

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2011