From patchwork Tue Dec 25 09:03:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 2641 Return-Path: Received: from nm24-vm4.bullet.mail.ukl.yahoo.com (nm24-vm4.bullet.mail.ukl.yahoo.com [217.146.176.178]) by open-mesh.org (Postfix) with ESMTPS id E01826019F8 for ; Tue, 25 Dec 2012 10:03:58 +0100 (CET) Received: from [217.146.183.184] by nm24.bullet.mail.ukl.yahoo.com with NNFMP; 25 Dec 2012 09:03:58 -0000 Received: from [77.238.184.70] by tm15.bullet.mail.ukl.yahoo.com with NNFMP; 25 Dec 2012 09:03:58 -0000 Received: from [127.0.0.1] by smtp139.mail.ukl.yahoo.com with NNFMP; 25 Dec 2012 09:03:58 -0000 X-Yahoo-Newman-Id: 425029.4078.bm@smtp139.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: mk0TvB4VM1nmLUA7FBpFLe_06O6ribZ0yWJhS2OIUVRT4hi CpQJK6T874yaRdwmDOMmUndhdG2ru._LOh_fpB6yCjViiSXAfqYhdGl9.4hs oBtpPRkIDvRkULwGrxeQZNd2Jnj3st3LKqGXpzRBtgfhGDBBsBwg_KUQ.VfS nMl1MWXGWAzx42wjp4rWtaCB_7BbCHkUMZc5Wr4WCdO8mnqv0WkM7ylHMy9M vP.x82pmej.50NJcG7XOzmH3s3v_pWOgj0EJB8NEHpTmZ0cYmXvCUaFl4Zg7 w0gCyiSf60sFIo.JezvTab_UlddWqU_Ip0Y7_8EVyd1c0MsOpE4bxpq131JA S2sj1yXXRqkDMM62dcCKHqek9jqYrgpIiMSh8w7QS7IKyzhL.EFH5KBLPxro A5cA6KB1HMDSsgyWVFaVlqORb0B2UtmuCGWlSRGXL2yDLDSmp X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@79.205.251.202 with plain) by smtp139.mail.ukl.yahoo.com with SMTP; 25 Dec 2012 09:03:58 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 25 Dec 2012 17:03:21 +0800 Message-Id: <1356426206-8667-3-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356426206-8667-1-git-send-email-lindner_marek@yahoo.de> References: <1356426206-8667-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 3/8] batman-adv: group tt type definitions together X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Dec 2012 09:03:59 -0000 Signed-off-by: Marek Lindner --- types.h | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/types.h b/types.h index db3fb25..9a66115 100644 --- a/types.h +++ b/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;