batman-adv: Place kref_get for tt_local_entry near use

[cascardo/linux.git] / net / batman-adv / network-coding.c

diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index 678f068..3814cfb 100644 (file)
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -51,10 +51,12 @@
 
 #include "hard-interface.h"
 #include "hash.h"
+#include "log.h"
 #include "originator.h"
 #include "packet.h"
 #include "routing.h"
 #include "send.h"
+#include "tvlv.h"
 
 static struct lock_class_key batadv_nc_coding_hash_lock_class_key;
 static struct lock_class_key batadv_nc_decoding_hash_lock_class_key;
@@ -854,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) {