Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic',...

[~andy/linux] / net / batman-adv / main.c

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 7edf8d719e15c8d4dfa345a6ffd35b361f6ab659..0a7cee0076f4ce60dbcb815e95a506939fa34687 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -84,8 +84,8 @@ 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->hna_lhash_lock);
-       spin_lock_init(&bat_priv->hna_ghash_lock);
+       spin_lock_init(&bat_priv->tt_lhash_lock);
+       spin_lock_init(&bat_priv->tt_ghash_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);
@@ -100,13 +100,13 @@ int mesh_init(struct net_device *soft_iface)
        if (originator_init(bat_priv) < 1)
                goto err;
 
-       if (hna_local_init(bat_priv) < 1)
+       if (tt_local_init(bat_priv) < 1)
                goto err;
 
-       if (hna_global_init(bat_priv) < 1)
+       if (tt_global_init(bat_priv) < 1)
                goto err;
 
-       hna_local_add(soft_iface, soft_iface->dev_addr);
+       tt_local_add(soft_iface, soft_iface->dev_addr);
 
        if (vis_init(bat_priv) < 1)
                goto err;
@@ -137,8 +137,8 @@ void mesh_free(struct net_device *soft_iface)
        gw_node_purge(bat_priv);
        originator_free(bat_priv);
 
-       hna_local_free(bat_priv);
-       hna_global_free(bat_priv);
+       tt_local_free(bat_priv);
+       tt_global_free(bat_priv);
 
        softif_neigh_purge(bat_priv);