Staging: batman-adv: softif bridge loop avoidance

[firefly-linux-kernel-4.4.55.git] / drivers / staging / batman-adv / types.h

diff --git a/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
index 8f6ba1c5692761348a5dfd8339e84432c2054c9c..835d51f9a95d10383e7a446cc8c08c9ee9840b29 100644 (file)
--- a/drivers/staging/batman-adv/types.h
+++ b/drivers/staging/batman-adv/types.h
@@ -123,6 +123,8 @@ struct bat_priv {
        atomic_t bcast_queue_left;
        atomic_t batman_queue_left;
        char num_ifaces;
+       struct hlist_head softif_neigh_list;
+       struct softif_neigh *softif_neigh;
        struct debug_log *debug_log;
        struct batman_if *primary_if;
        struct kobject *mesh_obj;
@@ -141,6 +143,7 @@ struct bat_priv {
        spinlock_t hna_ghash_lock; /* protects hna_global_hash */
        spinlock_t vis_hash_lock; /* protects vis_hash */
        spinlock_t vis_list_lock; /* protects vis_info::recv_list */
+       spinlock_t softif_neigh_lock; /* protects soft-interface neigh list */
        int16_t num_local_hna;
        atomic_t hna_local_changed;
        struct delayed_work hna_work;
@@ -239,4 +242,13 @@ struct recvlist_node {
        uint8_t mac[ETH_ALEN];
 };
 
+struct softif_neigh {
+       struct hlist_node list;
+       uint8_t addr[ETH_ALEN];
+       unsigned long last_seen;
+       short vid;
+       struct kref refcount;
+       struct rcu_head rcu;
+};
+
 #endif /* _NET_BATMAN_ADV_TYPES_H_ */