Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge

[pandora-kernel.git] / net / batman-adv / types.h

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 1ae3557..ab8d0fe 100644 (file)
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -224,22 +224,22 @@ struct socket_packet {
 
 struct tt_local_entry {
        uint8_t addr[ETH_ALEN];
+       struct hlist_node hash_entry;
        unsigned long last_seen;
        uint16_t flags;
        atomic_t refcount;
        struct rcu_head rcu;
-       struct hlist_node hash_entry;
 };
 
 struct tt_global_entry {
        uint8_t addr[ETH_ALEN];
+       struct hlist_node hash_entry; /* entry in the global table */
        struct orig_node *orig_node;
        uint8_t ttvn;
        uint16_t flags; /* only TT_GLOBAL_ROAM is used */
        unsigned long roam_at; /* time at which TT_GLOBAL_ROAM was set */
        atomic_t refcount;
        struct rcu_head rcu;
-       struct hlist_node hash_entry; /* entry in the global table */
 };
 
 struct tt_change_node {