From 19eb2c3b12bfb6dd813aa6b3816e2fcfa011d743 Mon Sep 17 00:00:00 2001
From: Antonio Quartulli <ordex@autistici.org>
Date: Sat, 22 Oct 2011 00:55:39 +0200
Subject: [PATCH] --- yaml --- r: 271623 b: refs/heads/master c:
 93840ac40bb0d0f177ef8af74e64671be67e8c37 h: refs/heads/master i:   271621:
 2413334f6b1b3cac27810f8bd18db3f3def8bd93   271619:
 9b8c1e991aba1d234120b93de3342b19679807a8   271615:
 e36eb74819f0294a59e678c506f840b3199616c2 v: v3

---
 [refs]                       | 2 +-
 trunk/net/batman-adv/types.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ff6d52b9a8bd..8a8788ec0678 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e8014947d6469df1566e9e253805557c5c0e4e0
+refs/heads/master: 93840ac40bb0d0f177ef8af74e64671be67e8c37
diff --git a/trunk/net/batman-adv/types.h b/trunk/net/batman-adv/types.h
index 25bd1db35370..51a0db7f6449 100644
--- a/trunk/net/batman-adv/types.h
+++ b/trunk/net/batman-adv/types.h
@@ -223,22 +223,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 {