From: Marek Lindner <[email protected]>

Signed-off-by: Marek Lindner <[email protected]>
Signed-off-by: Antonio Quartulli <[email protected]>
---
 net/batman-adv/types.h | 58 +++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index db3fb25..9a66115 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -339,35 +339,6 @@ struct batadv_socket_packet {
        struct batadv_icmp_packet_rr icmp_packet;
 };
 
-struct batadv_tt_common_entry {
-       uint8_t addr[ETH_ALEN];
-       struct hlist_node hash_entry;
-       uint16_t flags;
-       unsigned long added_at;
-       atomic_t refcount;
-       struct rcu_head rcu;
-};
-
-struct batadv_tt_local_entry {
-       struct batadv_tt_common_entry common;
-       unsigned long last_seen;
-};
-
-struct batadv_tt_global_entry {
-       struct batadv_tt_common_entry common;
-       struct hlist_head orig_list;
-       spinlock_t list_lock;   /* protects the list */
-       unsigned long roam_at; /* time at which TT_GLOBAL_ROAM was set */
-};
-
-struct batadv_tt_orig_list_entry {
-       struct batadv_orig_node *orig_node;
-       uint8_t ttvn;
-       atomic_t refcount;
-       struct rcu_head rcu;
-       struct hlist_node list;
-};
-
 #ifdef CONFIG_BATMAN_ADV_BLA
 struct batadv_backbone_gw {
        uint8_t orig[ETH_ALEN];
@@ -393,6 +364,35 @@ struct batadv_claim {
 };
 #endif
 
+struct batadv_tt_common_entry {
+       uint8_t addr[ETH_ALEN];
+       struct hlist_node hash_entry;
+       uint16_t flags;
+       unsigned long added_at;
+       atomic_t refcount;
+       struct rcu_head rcu;
+};
+
+struct batadv_tt_local_entry {
+       struct batadv_tt_common_entry common;
+       unsigned long last_seen;
+};
+
+struct batadv_tt_global_entry {
+       struct batadv_tt_common_entry common;
+       struct hlist_head orig_list;
+       spinlock_t list_lock;   /* protects the list */
+       unsigned long roam_at; /* time at which TT_GLOBAL_ROAM was set */
+};
+
+struct batadv_tt_orig_list_entry {
+       struct batadv_orig_node *orig_node;
+       uint8_t ttvn;
+       atomic_t refcount;
+       struct rcu_head rcu;
+       struct hlist_node list;
+};
+
 struct batadv_tt_change_node {
        struct list_head list;
        struct batadv_tt_change change;
-- 
1.8.0.2

Reply via email to