commits August 2015

commits@lists.open-mesh.org

1 participants
114 discussions

[batman-adv] next: batman-adv: Start new development cycle (d27b2ba)
by postmaster＠open-mesh.org 04 Aug '15

04 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit d27b2ba40a5eff2c4a5496a82d3ef96c977ac491 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Aug 4 14:43:16 2015 +0200 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- d27b2ba40a5eff2c4a5496a82d3ef96c977ac491 net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 41d27c7..dde0039 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2015.1" +#define BATADV_SOURCE_VERSION "2015.2" #endif /* B.A.T.M.A.N. parameters */

1 0

[batman-adv] next: Merge branch 'next' (bea6f41)
by postmaster＠open-mesh.org 04 Aug '15

04 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit bea6f41c8e09e02d5a3bc78200bd3e9c11a287b4 Merge: 07269be d27b2ba Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Aug 4 17:48:48 2015 +0200 Merge branch 'next' >--------------------------------------------------------------- bea6f41c8e09e02d5a3bc78200bd3e9c11a287b4 CHANGELOG | 22 ++++++++++++++++++++++ README.external | 2 +- net/batman-adv/main.h | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-)

1 0

[batman-adv] maint: batman-adv: Update compatible kernel version number (95b64b1)
by postmaster＠open-mesh.org 04 Aug '15

04 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 95b64b1cef38340f48f4eba99689e0fb1feddcd0 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Aug 4 14:37:19 2015 +0200 batman-adv: Update compatible kernel version number Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 95b64b1cef38340f48f4eba99689e0fb1feddcd0 README.external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.external b/README.external index c3fcf3a..ff2e9e8 100644 --- a/README.external +++ b/README.external @@ -6,7 +6,7 @@ and as external module. The external module allows to get 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 - 4.1. Supporting older versions is not +with Linux 2.6.29 - 4.2. 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. :-)

1 0

[batman-adv] maint's head updated: batman-adv: Update compatible kernel version number (95b64b1)
by postmaster＠open-mesh.org 04 Aug '15

04 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'maint' now includes: 73c9ecc batman-adv: Check total_size when queueing fragments 939717c batman-adv: Use only queued fragments when merging fe67bb4 batman-adv: debugfs, avoid compiling for !DEBUG_FS 9aef872 batman-adv: tvlv realloc, move error handling into if block d857186 batman-adv: Makefile, Sort alphabetically 0cc4569 batman-adv: iv_ogm_iface_enable, direct return values ec3b2d9 batman-adv: iv_ogm_aggr_packet, bool return value ca2655c Merge branch 'next' 3de1d1b batman-adv: iv_ogm_send_to_if, declare char* as const 9081091 batman-adv: make gen-compat-autoconf.sh POSIX compliant 1b49f8e batman-adv: IS_ENABLED compat code 3f74f35 batman-adv: ignore netdev_set_master() calls on kernels older than 2.6.39 453dea1 batman-adv: Use safer default config for optional features 4ce865d batman-adv: checkpatch - comparison to NULL could be rewritten 5d4ff51 batman-adv: checkpatch - spaces preferred around that '*' f7ac9a4 batman-adv: iv_ogm_can_aggregate, code readability 442b546 batman-adv: iv_ogm_orig_update, remove unnecessary brackets 2f9d8a2 batman-adv: checkpatch - wrong alignment 02c9bee Merge branch 'next' a467a76 batman-adv: iv_ogm_aggregate_new, simplify error handling 253a6dd batman-adv: iv_ogm_queue_add, Simplify expressions 3040f9c batman-adv: iv_ogm_orig_update, style, add missin brackets d00159a batman-adv: iv_ogm, Fix dup_status comment 63c15a5 batman-adv: iv_ogm, fix coding style 11c63fa batman-adv: iv_ogm, fix comment function name 3606e0a batman-adv: Use common Jenkins Hash implementation a915b64 batman-adv: split name from variable for uint mesh attributes 956e12a batman-adv: add bat_neigh_free API eb923e9 batman-adv: types, Fix comment on bcast_own 8435e41 batman-adv: Remove unnecessary check for orig_ifinfo not NULL a5b709e batman-adv: main, Convert is_my_mac() to bool 16af734 batman-adv: main, batadv_compare_eth return bool 32a451a batman-adv: Remove unnecessary ret variable 16b4833 batman-adv: Remove unnecessary ret variable in algo_register 6c0b7de Merge branch 'next' 141c6e9 Merge branch 'next' 9f01c16 Merge branch 'next' 5857ad3 batman-adv: Remove explicit compat.h include and split compat.h 7df6200 batman-adv: Add required includes to all files d40162d batman-adv: Remove unused IFF_BRIDGE_PORT live patching hack 13f9fdd batman-adv: Automatically create nested kfree_rcu helper functions 620c91f Merge branch 'next' 125d5a8 Merge branch 'next' c7f3a86 batman-adv: update copyright years for 2015 in compat code eb69667 batman-adv: Use kernel-like folder structure c69c935 batman-adv: Add Kconfig to the sources 098c0f1 batman-adv: Add link to kernel README e9d11c6 batman-adv: Clarify calculation precedence for '&' and '?' e944023 batman-adv: Remove unused post-VLAN ethhdr in batadv_gw_dhcp_recipient_get be22f93 batman-adv: Start new development cycle 34124bb Merge branch 'next' 768323e Merge branch 'maint' into next 2535f8c Merge branch 'maint' into next 7870bad Merge branch 'maint' into next 2474b5d Merge branch 'maint' into next 2fc460e Merge branch 'maint' into next cc063e9 Merge branch 'maint' into next a8c7689 Merge branch 'maint' into next 8592db1 Merge branch 'maint' into next 126c2f7 Merge branch 'maint' into next e9aa585 batman-adv: Update CHANGELOG for upcoming release 95b64b1 batman-adv: Update compatible kernel version number

1 0

[batman-adv] maint: batman-adv: Update CHANGELOG for upcoming release (e9aa585)
by postmaster＠open-mesh.org 04 Aug '15

04 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit e9aa5850b7f48caece78522b385a1c9976641d73 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Aug 4 14:36:23 2015 +0200 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- e9aa5850b7f48caece78522b385a1c9976641d73 CHANGELOG | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 67ef30b..d9f7b08 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,25 @@ +batman-adv 2015.1 + + * support latest kernels (2.6.29 - 4.2) + * cleanup of coding style + * cleanup of the compatibility layer + * convert to the Linux source directory structure + * adjust default configuration + - disable network coding + - enable bridge loop avoidance + * bugs squashed: + - avoid DAT to mess up local LAN state + - fix race conditions in DAT/NC/TT/MCAST TVLV handlers + - fix build system POSIX compatibility + - fix gateway selection in fast connection (1) gw_mode + - fix initialization of detected gateway, which caused hangs on unloads + - fix race conditions in the translation table + - fix kernel crash due to missing NULL checks in vlan handlers + - fix potentially broken header access by multicast optimization + - fix broadcast packets cleanup for purged outgoing interface + + -- Tue, 04 Aug 2015 14:34:42 +0200 + batman-adv 2015.0 * support latest kernels (2.6.29 - 4.1)

1 0

[batman-adv] master: batman-adv: fix gateway client style issues (07269be)
by postmaster＠open-mesh.org 04 Aug '15

04 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 07269bea2ef06723a3c1045a60635bf370e41c42 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Aug 4 15:44:06 2015 +0200 batman-adv: fix gateway client style issues commit 0511575c4d03 ("batman-adv: remove obsolete deleted attribute for gateway node") incorrectly added an empy line and forgot to remove an include. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 07269bea2ef06723a3c1045a60635bf370e41c42 net/batman-adv/gateway_client.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 634c7e3..e6c8382 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -27,7 +27,6 @@ #include <linux/in.h> #include <linux/ip.h> #include <linux/ipv6.h> -#include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/list.h> #include <linux/netdevice.h> @@ -565,7 +564,6 @@ void batadv_gw_node_free(struct batadv_priv *bat_priv) spin_lock_bh(&bat_priv->gw.list_lock); hlist_for_each_entry_safe(gw_node, node_tmp, &bat_priv->gw.list, list) { - hlist_del_init_rcu(&gw_node->list); batadv_gw_node_free_ref(gw_node); }

1 0

[linux-merge]; annotated tag, batman-adv-fix-for-davem, created. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 04 Aug '15

04 Aug '15

The annotated tag, batman-adv-fix-for-davem has been created at 96cb57c442a3985a9d2ad8743e80727f76f68ce4 (tag) tagging ec3b66e09f164824dd4f334b3802b742b7df651b (commit) replaces v4.2-rc3 tagged by Antonio Quartulli on Tue Aug 4 11:40:06 2015 +0200 - Shortlog ------------------------------------------------------------ Included changes: - avoid integer overflow in GW selection routine - prevent DAT from replying on behalf of local clients and confuse L2 bridges - prevent race condition by making capability bit changes atomic (use clear/set/test_bit) - fix synchronization issue in mcast tvlv handler - fix crash on double list removal of TT objects (tt_local_entry and tt_request) - initialize bw values for new GWs objects to prevent memory leak - fix leak by puring packets enqueued for sending upon iface removal - ensure network header pointer is set in skb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJVwJFgAAoJEOb/4TMchkvfz6cP/R1MLn0IDUZWMQ6awUGPVD8b IeNuTO0ttd267gd+Rhjq2laye6tLuiFqLW5hEeewHpVqZ4TbFESSfJy4R1Yy+GOU LYLn1x3hx2xzCxIq9copKjXl8JmQZkPIlqS9W0c2qdc7Hr52BHE64g0uoX43z/sJ 1si8z5nm0TkYsygO88qhFfvzhxv3HACgecnb8qa23J5x2f7MPeN2KPOjfmVa51DH GROzFPG5YTb/8/vLEbcaJCAK0OemYrpRbPD4jdj+MLvjzgX6hd1lP7Iwt3v657o8 Y3iUZWybUyfLa5Zo0KC5YwMV2aQMjOIIxrj/lruu6A8nmRZLqMRP7tdLUrKaAbQp muHykD6PHSZaGIc2yFRroYTgfPivuwfVSHi9sA9ISlsrPu4vdWjL8zlfTB9O01Iv HEyvRy6xANGKiIX1CWyOnY3PQGvVMLqODXnrbfq8euiKU5amdScwIbjBMBckN4ES 9MFTLiJbl+bFTRswC0c/Fmag6FK8Id4+Sj7zZ4uyFB69Jg7A6743Ke9b/0TO7GvW B8IPlgstISHWm/fNlpLJkHakRV9lnjUghot/WCcNORs0BNREMsbECmUVc7IKvuZP k7MJA9gAyh91L1/+amTDD4/hTYhpkSW4GKIe2qBKiTZWnFoFRLx45MNfe/qnhj0D DgYfoRzeiiQUjS26ePjO =cRV3 -----END PGP SIGNATURE----- Antonio Quartulli (1): batman-adv: avoid DAT to mess up LAN state Linus Lüssing (6): batman-adv: Make DAT capability changes atomic batman-adv: Make NC capability changes atomic batman-adv: Make TT capability changes atomic batman-adv: Make MCAST capability changes atomic batman-adv: Fix potential synchronization issues in mcast tvlv handler batman-adv: Fix potentially broken skb network header access Marek Lindner (3): batman-adv: fix kernel crash due to missing NULL checks batman-adv: protect tt_local_entry from concurrent delete events batman-adv: protect tt request from double deletion Ruben Wisniewski (1): batman-adv: Avoid u32 overflow during gateway select Simon Wunderlich (2): batman-adv: initialize up/down values when adding a gateway batman-adv: remove broadcast packets scheduled for purged outgoing if Sven Eckelmann (1): batman-adv: Replace gw_reselect divisor with simple shift ----------------------------------------------------------------------- --

1 0

[batman-adv] master: batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention (ce54500)
by postmaster＠open-mesh.org 03 Aug '15

03 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ce54500bf9a42348f4b0c9e0a7a61f91590d3b8d Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jul 26 04:59:15 2015 +0800 batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- ce54500bf9a42348f4b0c9e0a7a61f91590d3b8d net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/originator.c | 7 ++++--- net/batman-adv/originator.h | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 5e93af4..912d9c3 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -298,7 +298,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, { struct batadv_neigh_node *neigh_node; - neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, orig_node); + neigh_node = batadv_neigh_node_new(orig_node, hard_iface, neigh_addr); if (!neigh_node) goto out; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index d6d9809..099a84a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -444,16 +444,17 @@ out: /** * batadv_neigh_node_new - create and init a new neigh_node object + * @orig_node: originator object representing the neighbour * @hard_iface: the interface where the neighbour is connected to * @neigh_addr: the mac address of the neighbour interface - * @orig_node: originator object representing the neighbour * * Allocates a new neigh_node object and initialises all the generic fields. * Returns the new object or NULL on failure. */ struct batadv_neigh_node * -batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr, struct batadv_orig_node *orig_node) +batadv_neigh_node_new(struct batadv_orig_node *orig_node, + struct batadv_hard_iface *hard_iface, + const u8 *neigh_addr) { struct batadv_neigh_node *neigh_node; diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 3fc76f6..fde3438 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -46,8 +46,9 @@ batadv_neigh_node_get(const struct batadv_orig_node *orig_node, const struct batadv_hard_iface *hard_iface, const u8 *addr); struct batadv_neigh_node * -batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr, struct batadv_orig_node *orig_node); +batadv_neigh_node_new(struct batadv_orig_node *orig_node, + struct batadv_hard_iface *hard_iface, + const u8 *neigh_addr); void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node); struct batadv_neigh_node * batadv_orig_router_get(struct batadv_orig_node *orig_node,

1 0

[batman-adv] master: batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention (a09a26a)
by postmaster＠open-mesh.org 03 Aug '15

03 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a09a26a45f270212c41a752761c3ffadfeae19ab Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jul 26 04:59:15 2015 +0800 batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- a09a26a45f270212c41a752761c3ffadfeae19ab net/batman-adv/originator.c | 7 ++++--- net/batman-adv/originator.h | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index d6d9809..099a84a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -444,16 +444,17 @@ out: /** * batadv_neigh_node_new - create and init a new neigh_node object + * @orig_node: originator object representing the neighbour * @hard_iface: the interface where the neighbour is connected to * @neigh_addr: the mac address of the neighbour interface - * @orig_node: originator object representing the neighbour * * Allocates a new neigh_node object and initialises all the generic fields. * Returns the new object or NULL on failure. */ struct batadv_neigh_node * -batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr, struct batadv_orig_node *orig_node) +batadv_neigh_node_new(struct batadv_orig_node *orig_node, + struct batadv_hard_iface *hard_iface, + const u8 *neigh_addr) { struct batadv_neigh_node *neigh_node; diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 3fc76f6..fde3438 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -46,8 +46,9 @@ batadv_neigh_node_get(const struct batadv_orig_node *orig_node, const struct batadv_hard_iface *hard_iface, const u8 *addr); struct batadv_neigh_node * -batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr, struct batadv_orig_node *orig_node); +batadv_neigh_node_new(struct batadv_orig_node *orig_node, + struct batadv_hard_iface *hard_iface, + const u8 *neigh_addr); void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node); struct batadv_neigh_node * batadv_orig_router_get(struct batadv_orig_node *orig_node,

1 0

[batman-adv] master: batman-adv: remove obsolete deleted attribute for gateway node (0511575)
by postmaster＠open-mesh.org 03 Aug '15

03 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0511575c4d034115f618056da65ee51eb25d314d Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Mon Aug 3 19:13:58 2015 +0200 batman-adv: remove obsolete deleted attribute for gateway node With rcu, the gateway node deleted attribute is not needed anymore. In fact, it may delay the free of the gateway node and its referenced structures. Therefore remove it altogether and simplify purging as well. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 0511575c4d034115f618056da65ee51eb25d314d net/batman-adv/gateway_client.c | 48 +++++++++++------------------------------ net/batman-adv/gateway_client.h | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/originator.c | 1 - net/batman-adv/types.h | 2 -- 5 files changed, 14 insertions(+), 41 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index d7ca214..634c7e3 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -161,9 +161,6 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) rcu_read_lock(); hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.list, list) { - if (gw_node->deleted) - continue; - orig_node = gw_node->orig_node; router = batadv_orig_router_get(orig_node, BATADV_IF_DEFAULT); if (!router) @@ -473,9 +470,6 @@ batadv_gw_node_get(struct batadv_priv *bat_priv, if (gw_node_tmp->orig_node != orig_node) continue; - if (gw_node_tmp->deleted) - continue; - if (!atomic_inc_not_zero(&gw_node_tmp->refcount)) continue; @@ -525,9 +519,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, gw_node->bandwidth_down = ntohl(gateway->bandwidth_down); gw_node->bandwidth_up = ntohl(gateway->bandwidth_up); - gw_node->deleted = 0; if (ntohl(gateway->bandwidth_down) == 0) { - gw_node->deleted = jiffies; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Gateway %pM removed from gateway list\n", orig_node->orig); @@ -535,14 +527,21 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, /* Note: We don't need a NULL check here, since curr_gw never * gets dereferenced. */ + spin_lock_bh(&bat_priv->gw.list_lock); + hlist_del_init_rcu(&gw_node->list); + spin_unlock_bh(&bat_priv->gw.list_lock); + + batadv_gw_node_free_ref(gw_node); + curr_gw = batadv_gw_get_selected_gw_node(bat_priv); if (gw_node == curr_gw) batadv_gw_reselect(bat_priv); + + if (curr_gw) + batadv_gw_node_free_ref(curr_gw); } out: - if (curr_gw) - batadv_gw_node_free_ref(curr_gw); if (gw_node) batadv_gw_node_free_ref(gw_node); } @@ -558,39 +557,19 @@ void batadv_gw_node_delete(struct batadv_priv *bat_priv, batadv_gw_node_update(bat_priv, orig_node, &gateway); } -void batadv_gw_node_purge(struct batadv_priv *bat_priv) +void batadv_gw_node_free(struct batadv_priv *bat_priv) { - struct batadv_gw_node *gw_node, *curr_gw; + struct batadv_gw_node *gw_node; struct hlist_node *node_tmp; - unsigned long timeout = msecs_to_jiffies(2 * BATADV_PURGE_TIMEOUT); - int do_reselect = 0; - - curr_gw = batadv_gw_get_selected_gw_node(bat_priv); spin_lock_bh(&bat_priv->gw.list_lock); - hlist_for_each_entry_safe(gw_node, node_tmp, &bat_priv->gw.list, list) { - if (((!gw_node->deleted) || - (time_before(jiffies, gw_node->deleted + timeout))) && - atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) - continue; - if (curr_gw == gw_node) - do_reselect = 1; - - hlist_del_rcu(&gw_node->list); + hlist_del_init_rcu(&gw_node->list); batadv_gw_node_free_ref(gw_node); } - spin_unlock_bh(&bat_priv->gw.list_lock); - - /* gw_reselect() needs to acquire the gw_list_lock */ - if (do_reselect) - batadv_gw_reselect(bat_priv); - - if (curr_gw) - batadv_gw_node_free_ref(curr_gw); } /* fails if orig_node has no router */ @@ -654,9 +633,6 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) rcu_read_lock(); hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.list, list) { - if (gw_node->deleted) - continue; - /* fails if orig_node has no router */ if (batadv_write_buffer_text(bat_priv, seq, gw_node) < 0) continue; diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h index ef4d7e3..fa95277 100644 --- a/net/batman-adv/gateway_client.h +++ b/net/batman-adv/gateway_client.h @@ -38,7 +38,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, struct batadv_tvlv_gateway_data *gateway); void batadv_gw_node_delete(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node); -void batadv_gw_node_purge(struct batadv_priv *bat_priv); +void batadv_gw_node_free(struct batadv_priv *bat_priv); int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset); bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct sk_buff *skb); enum batadv_dhcp_recipient diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index e61c5f3..d7f17c1 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -199,7 +199,7 @@ void batadv_mesh_free(struct net_device *soft_iface) batadv_purge_outstanding_packets(bat_priv, NULL); - batadv_gw_node_purge(bat_priv); + batadv_gw_node_free(bat_priv); batadv_nc_mesh_free(bat_priv); batadv_dat_free(bat_priv); batadv_bla_free(bat_priv); diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index f751775..d6d9809 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1028,7 +1028,6 @@ static void _batadv_purge_orig(struct batadv_priv *bat_priv) spin_unlock_bh(list_lock); } - batadv_gw_node_purge(bat_priv); batadv_gw_election(bat_priv); } diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 2f5e6c3..d260efd 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -328,7 +328,6 @@ enum batadv_orig_capabilities { * @orig_node: pointer to corresponding orig node * @bandwidth_down: advertised uplink download bandwidth * @bandwidth_up: advertised uplink upload bandwidth - * @deleted: this struct is scheduled for deletion * @refcount: number of contexts the object is used * @rcu: struct used for freeing in an RCU-safe manner */ @@ -337,7 +336,6 @@ struct batadv_gw_node { struct batadv_orig_node *orig_node; u32 bandwidth_down; u32 bandwidth_up; - unsigned long deleted; atomic_t refcount; struct rcu_head rcu; };

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2015