diff options
| author | Marek Lindner <mareklindner@neomailbox.ch> | 2015-07-26 04:37:15 +0800 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2015-08-27 20:15:30 +0200 |
| commit | f729dc70dafec281e524f51ae496a72ea4f8e319 (patch) | |
| tree | ca910c0459ac63af7f3f047e01b175b8052407ed /net | |
| parent | 1dd34b5ad8aebaff17b625fc0126e18243008a3f (diff) | |
| download | talos-obmc-linux-f729dc70dafec281e524f51ae496a72ea4f8e319.tar.gz talos-obmc-linux-f729dc70dafec281e524f51ae496a72ea4f8e319.zip | |
batman-adv: move hardif refcount inc to batadv_neigh_node_new()
The batadv_neigh_node cleanup function 'batadv_neigh_node_free_rcu()'
takes care of reducing the hardif refcounter, hence it's only logical
to assume the creating function of that same object
'batadv_neigh_node_new()' takes care of increasing the same refcounter.
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 6 | ||||
| -rw-r--r-- | net/batman-adv/originator.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 5c122000688f..b9b8b333b363 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -303,12 +303,6 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, if (!neigh_node) goto out; - if (!atomic_inc_not_zero(&hard_iface->refcount)) { - kfree(neigh_node); - neigh_node = NULL; - goto out; - } - neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 610620aa8d26..f8317c1db427 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -461,6 +461,12 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, if (!neigh_node) goto out; + if (!atomic_inc_not_zero(&hard_iface->refcount)) { + kfree(neigh_node); + neigh_node = NULL; + goto out; + } + INIT_HLIST_NODE(&neigh_node->list); INIT_HLIST_HEAD(&neigh_node->ifinfo_list); spin_lock_init(&neigh_node->ifinfo_lock); |
