summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/network-coding.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2016-07-15 17:39:21 +0200
committerSimon Wunderlich <sw@simonwunderlich.de>2016-08-09 07:54:46 +0200
commit55db2d590298e8ffe6ee66134157aa710e45faa2 (patch)
treee164cb4d3dea339f07eb8050f6699847b87d0eaa /net/batman-adv/network-coding.c
parent8427445886d23729cc41305cef580605202f01db (diff)
downloadlinux-stable-55db2d590298e8ffe6ee66134157aa710e45faa2.tar.gz
linux-stable-55db2d590298e8ffe6ee66134157aa710e45faa2.tar.bz2
linux-stable-55db2d590298e8ffe6ee66134157aa710e45faa2.zip
batman-adv: Place kref_get for orig_node near use
It is hard to understand why the refcnt is increased when it isn't done near the actual place the new reference is used. So using kref_get right before the place which requires the reference and in the same function helps to avoid accidental problems caused by incorrect reference counting. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv/network-coding.c')
-rw-r--r--net/batman-adv/network-coding.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index 293ef4ffd4e1..3814cfb94846 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -856,14 +856,13 @@ batadv_nc_get_nc_node(struct batadv_priv *bat_priv,
if (!nc_node)
return NULL;
- kref_get(&orig_neigh_node->refcount);
-
/* Initialize nc_node */
INIT_LIST_HEAD(&nc_node->list);
- ether_addr_copy(nc_node->addr, orig_node->orig);
- nc_node->orig_node = orig_neigh_node;
kref_init(&nc_node->refcount);
kref_get(&nc_node->refcount);
+ ether_addr_copy(nc_node->addr, orig_node->orig);
+ kref_get(&orig_neigh_node->refcount);
+ nc_node->orig_node = orig_neigh_node;
/* Select ingoing or outgoing coding node */
if (in_coding) {