From patchwork Sat Jan 19 13:27:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 213851 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8092B2C007B for ; Sun, 20 Jan 2013 00:29:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751748Ab3ASN3o (ORCPT ); Sat, 19 Jan 2013 08:29:44 -0500 Received: from latitanza.investici.org ([82.94.249.234]:57780 "EHLO latitanza.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751621Ab3ASN3n (ORCPT ); Sat, 19 Jan 2013 08:29:43 -0500 Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 13AA69808E; Sat, 19 Jan 2013 13:29:37 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 latitanza.investici.org 13AA69808E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1358602182; bh=TgrfdB62tudIQpgoiuX0jp1Tr22o6UNUDMcL7sGIKU0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=QiXjw6X4WF5+4uxdhUC25W1TpRmmWs1YeCs27oxA0UqgTLazoJq9HVcMdLA8ecs55 sNZDTJmB/b09JK4LOx9WvXkoDeatZUjBr1do1BsMkI+pHhsRALRpKAJp08y8DrFzFt +27agBM98trt+ter26NhYHXF/LQc8uXernVvn+EY= From: Antonio Quartulli To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Marek Lindner , Antonio Quartulli Subject: [PATCH 04/13] batman-adv: group tt type definitions together Date: Sat, 19 Jan 2013 21:27:50 +0800 Message-Id: <1358602079-24024-5-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1358602079-24024-1-git-send-email-ordex@autistici.org> References: <1358602079-24024-1-git-send-email-ordex@autistici.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Marek Lindner Signed-off-by: Marek Lindner Signed-off-by: Antonio Quartulli --- 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;