diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 22:53:02 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 22:53:02 +0200 |
| commit | f8647b506d7116a1a3accd8d618184096e85f50b (patch) | |
| tree | f10bc7201fda2a36c035548a0ea62210ad57adb6 /net/batman-adv/gateway_client.c | |
| parent | MIPS: IP22/IP28: Improve GIO support (diff) | |
| parent | MIPS: Call find_vma with the mmap_sem held (diff) | |
| download | linux-f8647b506d7116a1a3accd8d618184096e85f50b.tar.xz linux-f8647b506d7116a1a3accd8d618184096e85f50b.zip | |
Merge branch '3.15-fixes' into mips-for-linux-next
Diffstat (limited to 'net/batman-adv/gateway_client.c')
| -rw-r--r-- | net/batman-adv/gateway_client.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index c835e137423b..90cff585b37d 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -42,8 +42,10 @@ static void batadv_gw_node_free_ref(struct batadv_gw_node *gw_node) { - if (atomic_dec_and_test(&gw_node->refcount)) + if (atomic_dec_and_test(&gw_node->refcount)) { + batadv_orig_node_free_ref(gw_node->orig_node); kfree_rcu(gw_node, rcu); + } } static struct batadv_gw_node * @@ -406,9 +408,14 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, if (gateway->bandwidth_down == 0) return; + if (!atomic_inc_not_zero(&orig_node->refcount)) + return; + gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC); - if (!gw_node) + if (!gw_node) { + batadv_orig_node_free_ref(orig_node); return; + } INIT_HLIST_NODE(&gw_node->list); gw_node->orig_node = orig_node; |