1 files changed, 5 insertions, 17 deletions

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index ac9bdf8f80a6..8c32cf1c2dec 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -18,6 +18,7 @@
  */
 
 #include "main.h"
+#include "distributed-arp-table.h"
 #include "originator.h"
 #include "hash.h"
 #include "translation-table.h"
@@ -220,9 +221,9 @@ struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,
         atomic_set(&orig_node->refcount, 2);
 
         orig_node->tt_initialised = false;
-        orig_node->tt_poss_change = false;
         orig_node->bat_priv = bat_priv;
         memcpy(orig_node->orig, addr, ETH_ALEN);
+        batadv_dat_init_orig_node_addr(orig_node);
         orig_node->router = NULL;
         orig_node->tt_crc = 0;
         atomic_set(&orig_node->last_ttvn, 0);
@@ -415,23 +416,10 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset)
         int last_seen_msecs;
         unsigned long last_seen_jiffies;
         uint32_t i;
-        int ret = 0;
 
-        primary_if = batadv_primary_if_get_selected(bat_priv);
-
-        if (!primary_if) {
-                ret = seq_printf(seq,
-                                 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
-                                 net_dev->name);
-                goto out;
-        }
-
-        if (primary_if->if_status != BATADV_IF_ACTIVE) {
-                ret = seq_printf(seq,
-                                 "BATMAN mesh %s disabled - primary interface not active\n",
-                                 net_dev->name);
+        primary_if = batadv_seq_print_text_primary_if_get(seq);
+        if (!primary_if)
                 goto out;
-        }
 
         seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
                    BATADV_SOURCE_VERSION, primary_if->net_dev->name,
@@ -485,7 +473,7 @@ next:
 out:
         if (primary_if)
                 batadv_hardif_free_ref(primary_if);
-        return ret;
+        return 0;
 }
 
 static int batadv_orig_node_add_if(struct batadv_orig_node *orig_node,