batman-adv: Consolidate logging related functions

[mirror_ubuntu-artful-kernel.git] / net / batman-adv / hard-interface.c

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 8c2f39962fa591ab02afacb2338feaefd698779f..ad2c37c5583b84431a19c29f590295ec779e2b82 100644 (file)
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -23,9 +23,9 @@
 #include <linux/byteorder/generic.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
-#include <linux/if.h>
 #include <linux/kernel.h>
 #include <linux/kref.h>
 #include <linux/list.h>
@@ -37,10 +37,12 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 
+#include "bat_algo.h"
 #include "bridge_loop_avoidance.h"
 #include "debugfs.h"
 #include "distributed-arp-table.h"
 #include "gateway_client.h"
+#include "log.h"
 #include "originator.h"
 #include "packet.h"
 #include "send.h"
@@ -553,9 +555,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
 
        batadv_hardif_recalc_extra_skbroom(soft_iface);
 
-       /* begin scheduling originator messages on that interface */
-       batadv_schedule_bat_ogm(hard_iface);
-
 out:
        return 0;
 
@@ -686,6 +685,8 @@ batadv_hardif_add_interface(struct net_device *net_dev)
        if (batadv_is_wifi_netdev(net_dev))
                hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS;
 
+       batadv_v_hardif_init(hard_iface);
+
        /* extra reference for return */
        kref_init(&hard_iface->refcount);
        kref_get(&hard_iface->refcount);