batman-adv: Consolidate logging related functions

[mirror_ubuntu-bionic-kernel.git] / net / batman-adv / bat_v_ogm.c

diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
index 473ebb9a0e737a23c29c7293cfe193959f1aec07..7ac9e0b306180bbf77af4a65030ede3cd939ff81 100644 (file)
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
@@ -39,13 +39,16 @@
 #include <linux/types.h>
 #include <linux/workqueue.h>
 
+#include "bat_algo.h"
 #include "hard-interface.h"
 #include "hash.h"
+#include "log.h"
 #include "originator.h"
 #include "packet.h"
 #include "routing.h"
 #include "send.h"
 #include "translation-table.h"
+#include "tvlv.h"
 
 /**
  * batadv_v_ogm_orig_get - retrieve and possibly create an originator node
@@ -683,8 +686,8 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,
        if (!orig_node)
                return;
 
-       neigh_node = batadv_neigh_node_new(orig_node, if_incoming,
-                                          ethhdr->h_source);
+       neigh_node = batadv_neigh_node_get_or_create(orig_node, if_incoming,
+                                                    ethhdr->h_source);
        if (!neigh_node)
                goto out;