drm/vc4: mark vc4_bo_cache_purge() static

[linux-2.6-block.git] / net / batman-adv / translation-table.c

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 57ec87f37050d98faefc37e989024a572d26b421..7e6df7a4964a77081f6d4de6862497d18baa523f 100644 (file)
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -47,10 +47,12 @@
 #include "bridge_loop_avoidance.h"
 #include "hard-interface.h"
 #include "hash.h"
+#include "log.h"
 #include "multicast.h"
 #include "originator.h"
 #include "packet.h"
 #include "soft-interface.h"
+#include "tvlv.h"
 
 /* hash class keys */
 static struct lock_class_key batadv_tt_local_hash_lock_class_key;
@@ -996,7 +998,6 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset)
        struct batadv_tt_local_entry *tt_local;
        struct batadv_hard_iface *primary_if;
        struct hlist_head *head;
-       unsigned short vid;
        u32 i;
        int last_seen_secs;
        int last_seen_msecs;
@@ -1023,7 +1024,6 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset)
                        tt_local = container_of(tt_common_entry,
                                                struct batadv_tt_local_entry,
                                                common);
-                       vid = tt_common_entry->vid;
                        last_seen_jiffies = jiffies - tt_local->last_seen;
                        last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);
                        last_seen_secs = last_seen_msecs / 1000;
@@ -1547,7 +1547,7 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv,
                            struct batadv_tt_global_entry *tt_global_entry)
 {
        struct batadv_neigh_node *router, *best_router = NULL;
-       struct batadv_algo_ops *bao = bat_priv->bat_algo_ops;
+       struct batadv_algo_ops *bao = bat_priv->algo_ops;
        struct hlist_head *head;
        struct batadv_tt_orig_list_entry *orig_entry, *best_entry = NULL;
 
@@ -1559,8 +1559,8 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv,
                        continue;
 
                if (best_router &&
-                   bao->bat_neigh_cmp(router, BATADV_IF_DEFAULT,
-                                      best_router, BATADV_IF_DEFAULT) <= 0) {
+                   bao->neigh.cmp(router, BATADV_IF_DEFAULT, best_router,
+                                  BATADV_IF_DEFAULT) <= 0) {
                        batadv_neigh_node_put(router);
                        continue;
                }