[commits] [batman-adv] master: batman-adv: fix ifdef for DAT in types.h (e65e75c)

postmaster at open-mesh.org postmaster at open-mesh.org
Tue Oct 16 10:51:39 CEST 2012


Repository : ssh://git@open-mesh.org/batman-adv

On branch  : master

>---------------------------------------------------------------

commit e65e75c756d325d3b8a6af51d07cbed236c5ad96
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Tue Oct 16 08:12:33 2012 +0200

    batman-adv: fix ifdef for DAT in types.h
    
    It is better to fully enclose the batadv_priv_dat struct in the #ifdef/endif
    block instead of the enclosing only the field which would not compile while DAT
    is off.
    
    This was introduced with ("batman-adv: Distributed ARP Table - add compile
    option")
    
    Reported-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>


>---------------------------------------------------------------

e65e75c756d325d3b8a6af51d07cbed236c5ad96
 types.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types.h b/types.h
index b1c261b..1519ae3 100644
--- a/types.h
+++ b/types.h
@@ -255,13 +255,13 @@ struct batadv_priv_vis {
  * @hash: hashtable representing the local ARP cache
  * @work: work queue callback item for cache purging
  */
-struct batadv_priv_dat {
 #ifdef CONFIG_BATMAN_ADV_DAT
+struct batadv_priv_dat {
 	batadv_dat_addr_t addr;
-#endif
 	struct batadv_hashtable *hash;
 	struct delayed_work work;
 };
+#endif
 
 struct batadv_priv {
 	atomic_t mesh_state;



More information about the commits mailing list