batman-adv: split routing API data structure in subobjects

[linux-2.6-microblaze.git] / net / batman-adv / hard-interface.c

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 8c2f399..1f90808 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_v.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"
@@ -245,7 +247,7 @@ static void batadv_primary_if_select(struct batadv_priv *bat_priv,
        if (!new_hard_iface)
                goto out;
 
-       bat_priv->bat_algo_ops->bat_primary_iface_set(new_hard_iface);
+       bat_priv->algo_ops->iface.primary_set(new_hard_iface);
        batadv_primary_if_update_addr(bat_priv, curr_hard_iface);
 
 out:
@@ -392,7 +394,7 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface)
 
        bat_priv = netdev_priv(hard_iface->soft_iface);
 
-       bat_priv->bat_algo_ops->bat_iface_update_mac(hard_iface);
+       bat_priv->algo_ops->iface.update_mac(hard_iface);
        hard_iface->if_status = BATADV_IF_TO_BE_ACTIVATED;
 
        /* the first active interface becomes our primary interface or
@@ -407,8 +409,8 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface)
 
        batadv_update_min_mtu(hard_iface->soft_iface);
 
-       if (bat_priv->bat_algo_ops->bat_iface_activate)
-               bat_priv->bat_algo_ops->bat_iface_activate(hard_iface);
+       if (bat_priv->algo_ops->iface.activate)
+               bat_priv->algo_ops->iface.activate(hard_iface);
 
 out:
        if (primary_if)
@@ -506,7 +508,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
        if (ret)
                goto err_dev;
 
-       ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface);
+       ret = bat_priv->algo_ops->iface.enable(hard_iface);
        if (ret < 0)
                goto err_upper;
 
@@ -515,7 +517,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
        hard_iface->if_status = BATADV_IF_INACTIVE;
        ret = batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces);
        if (ret < 0) {
-               bat_priv->bat_algo_ops->bat_iface_disable(hard_iface);
+               bat_priv->algo_ops->iface.disable(hard_iface);
                bat_priv->num_ifaces--;
                hard_iface->if_status = BATADV_IF_NOT_IN_USE;
                goto err_upper;
@@ -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;
 
@@ -599,7 +598,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
                        batadv_hardif_put(new_if);
        }
 
-       bat_priv->bat_algo_ops->bat_iface_disable(hard_iface);
+       bat_priv->algo_ops->iface.disable(hard_iface);
        hard_iface->if_status = BATADV_IF_NOT_IN_USE;
 
        /* delete all references to this hard_iface */
@@ -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);
@@ -782,7 +783,7 @@ static int batadv_hard_if_event(struct notifier_block *this,
                batadv_check_known_mac_addr(hard_iface->net_dev);
 
                bat_priv = netdev_priv(hard_iface->soft_iface);
-               bat_priv->bat_algo_ops->bat_iface_update_mac(hard_iface);
+               bat_priv->algo_ops->iface.update_mac(hard_iface);
 
                primary_if = batadv_primary_if_get_selected(bat_priv);
                if (!primary_if)