From aabea6cea1cb4d46c29dca80fa508900033c4e52 Mon Sep 17 00:00:00 2001
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Tue, 25 Dec 2012 17:03:21 +0800
Subject: [PATCH] --- yaml --- r: 351474 b: refs/heads/master c:
 2006fea82085cfd9ddc92b23ef1ea8d57e065c61 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f8b29dcf2067..c384b06a058e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0abf5d8117dc864135eda5adda12640e16ed0cb8
+refs/heads/master: 2006fea82085cfd9ddc92b23ef1ea8d57e065c61
diff --git a/trunk/net/batman-adv/types.h b/trunk/net/batman-adv/types.h
index db3fb252432d..9a66115bd9c5 100644
--- a/trunk/net/batman-adv/types.h
+++ b/trunk/net/batman-adv/types.h
@@ -339,6 +339,31 @@ struct batadv_socket_packet {
 	struct batadv_icmp_packet_rr icmp_packet;
 };
 
+#ifdef CONFIG_BATMAN_ADV_BLA
+struct batadv_backbone_gw {
+	uint8_t orig[ETH_ALEN];
+	short vid;		/* used VLAN ID */
+	struct hlist_node hash_entry;
+	struct batadv_priv *bat_priv;
+	unsigned long lasttime;	/* last time we heard of this backbone gw */
+	atomic_t wait_periods;
+	atomic_t request_sent;
+	atomic_t refcount;
+	struct rcu_head rcu;
+	uint16_t crc;		/* crc checksum over all claims */
+};
+
+struct batadv_claim {
+	uint8_t addr[ETH_ALEN];
+	short vid;
+	struct batadv_backbone_gw *backbone_gw;
+	unsigned long lasttime;	/* last time we heard of claim (locals only) */
+	struct rcu_head rcu;
+	atomic_t refcount;
+	struct hlist_node hash_entry;
+};
+#endif
+
 struct batadv_tt_common_entry {
 	uint8_t addr[ETH_ALEN];
 	struct hlist_node hash_entry;
@@ -368,31 +393,6 @@ struct batadv_tt_orig_list_entry {
 	struct hlist_node list;
 };
 
-#ifdef CONFIG_BATMAN_ADV_BLA
-struct batadv_backbone_gw {
-	uint8_t orig[ETH_ALEN];
-	short vid;		/* used VLAN ID */
-	struct hlist_node hash_entry;
-	struct batadv_priv *bat_priv;
-	unsigned long lasttime;	/* last time we heard of this backbone gw */
-	atomic_t wait_periods;
-	atomic_t request_sent;
-	atomic_t refcount;
-	struct rcu_head rcu;
-	uint16_t crc;		/* crc checksum over all claims */
-};
-
-struct batadv_claim {
-	uint8_t addr[ETH_ALEN];
-	short vid;
-	struct batadv_backbone_gw *backbone_gw;
-	unsigned long lasttime;	/* last time we heard of claim (locals only) */
-	struct rcu_head rcu;
-	atomic_t refcount;
-	struct hlist_node hash_entry;
-};
-#endif
-
 struct batadv_tt_change_node {
 	struct list_head list;
 	struct batadv_tt_change change;