Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / net / batman-adv / main.c

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 0a7cee0..b0f9068 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -58,9 +58,8 @@ static int __init batman_init(void)
 
        register_netdevice_notifier(&hard_if_notifier);
 
-       pr_info("B.A.T.M.A.N. advanced %s%s (compatibility version %i) "
-               "loaded\n", SOURCE_VERSION, REVISION_VERSION_STR,
-               COMPAT_VERSION);
+       pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) "
+               "loaded\n", SOURCE_VERSION, COMPAT_VERSION);
 
        return 0;
 }
@@ -84,8 +83,10 @@ int mesh_init(struct net_device *soft_iface)
 
        spin_lock_init(&bat_priv->forw_bat_list_lock);
        spin_lock_init(&bat_priv->forw_bcast_list_lock);
-       spin_lock_init(&bat_priv->tt_lhash_lock);
-       spin_lock_init(&bat_priv->tt_ghash_lock);
+       spin_lock_init(&bat_priv->tt_changes_list_lock);
+       spin_lock_init(&bat_priv->tt_req_list_lock);
+       spin_lock_init(&bat_priv->tt_roam_list_lock);
+       spin_lock_init(&bat_priv->tt_buff_lock);
        spin_lock_init(&bat_priv->gw_list_lock);
        spin_lock_init(&bat_priv->vis_hash_lock);
        spin_lock_init(&bat_priv->vis_list_lock);
@@ -96,14 +97,14 @@ int mesh_init(struct net_device *soft_iface)
        INIT_HLIST_HEAD(&bat_priv->forw_bcast_list);
        INIT_HLIST_HEAD(&bat_priv->gw_list);
        INIT_HLIST_HEAD(&bat_priv->softif_neigh_vids);
+       INIT_LIST_HEAD(&bat_priv->tt_changes_list);
+       INIT_LIST_HEAD(&bat_priv->tt_req_list);
+       INIT_LIST_HEAD(&bat_priv->tt_roam_list);
 
        if (originator_init(bat_priv) < 1)
                goto err;
 
-       if (tt_local_init(bat_priv) < 1)
-               goto err;
-
-       if (tt_global_init(bat_priv) < 1)
+       if (tt_init(bat_priv) < 1)
                goto err;
 
        tt_local_add(soft_iface, soft_iface->dev_addr);
@@ -111,6 +112,7 @@ int mesh_init(struct net_device *soft_iface)
        if (vis_init(bat_priv) < 1)
                goto err;
 
+       atomic_set(&bat_priv->gw_reselect, 0);
        atomic_set(&bat_priv->mesh_state, MESH_ACTIVE);
        goto end;
 
@@ -137,8 +139,7 @@ void mesh_free(struct net_device *soft_iface)
        gw_node_purge(bat_priv);
        originator_free(bat_priv);
 
-       tt_local_free(bat_priv);
-       tt_global_free(bat_priv);
+       tt_free(bat_priv);
 
        softif_neigh_purge(bat_priv);
 
@@ -155,9 +156,9 @@ void dec_module_count(void)
        module_put(THIS_MODULE);
 }
 
-int is_my_mac(uint8_t *addr)
+int is_my_mac(const uint8_t *addr)
 {
-       struct hard_iface *hard_iface;
+       const struct hard_iface *hard_iface;
 
        rcu_read_lock();
        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
@@ -182,8 +183,4 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_SUPPORTED_DEVICE(DRIVER_DEVICE);
-#ifdef REVISION_VERSION
-MODULE_VERSION(SOURCE_VERSION "-" REVISION_VERSION);
-#else
 MODULE_VERSION(SOURCE_VERSION);
-#endif