From patchwork Sun Dec 16 05:53:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 2657 Return-Path: Received: from nm2-vm0.bullet.mail.ukl.yahoo.com (nm2-vm0.bullet.mail.ukl.yahoo.com [217.146.183.226]) by open-mesh.org (Postfix) with ESMTPS id 471FD6019A8 for ; Sun, 16 Dec 2012 06:53:25 +0100 (CET) Received: from [217.146.183.210] by nm2.bullet.mail.ukl.yahoo.com with NNFMP; 16 Dec 2012 05:53:24 -0000 Received: from [217.146.182.149] by tm3.bullet.mail.ukl.yahoo.com with NNFMP; 16 Dec 2012 05:53:24 -0000 Received: from [127.0.0.1] by smtp118.mail.ukl.yahoo.com with NNFMP; 16 Dec 2012 05:53:24 -0000 X-Yahoo-Newman-Id: 537119.62019.bm@smtp118.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: jmOsEJkVM1lsyv3HLUQzh9c6fHPYU0VAHRKDTxjGei4Yb3l UGTDh3OWd0XZ3pBw96pl7CnbLEJ4iSFML8cZJFMu9YUQkZoF8OzbwU4rR9rJ 7oafQDYR8dOEHOuol1IV1PnyTMPx4uqZ6_16EKV71mmRvpagp10S6d2bWttC EAa4dhNKMb7IefAHtJ.Xg9vgWr2UN6GEWKXp9VCCfX3UNkupKHjUuLgf12hi WY66gQtJtxsKE6jDuWymiNeV.bH3u1N8jjLqaldR8Gk8OG56ejvGvT.hQlOL 33bSR0BHlMoj5eUID3J3VLiJTY0q48HGKTRj12aPdrM3XD9ZR5NtLsKaXlDQ gmxyq3IywWuffAXwy780eS.NUphdsmMj0jiPrMqgOgjhchL6Uhb.IwaSNUJJ H9q62yZgrj.2Gd0Dbq741rR.28yi9NvldV78Ux3ieb5g6adaRTfp4Z1xEELR Mpg00e2duH2aN.6IU X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@1.36.72.186 with plain) by smtp118.mail.ukl.yahoo.com with SMTP; 15 Dec 2012 21:53:24 -0800 PST From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 16 Dec 2012 13:53:15 +0800 Message-Id: <1355637195-28768-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.10.4 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: unbloat batadv_priv if debug is not enabled 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: Sun, 16 Dec 2012 05:53:25 -0000 Signed-off-by: Marek Lindner --- debugfs.c | 1 - soft-interface.c | 2 ++ types.h | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debugfs.c b/debugfs.c index 5136d32..55a9007 100644 --- a/debugfs.c +++ b/debugfs.c @@ -229,7 +229,6 @@ static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv) #else /* CONFIG_BATMAN_ADV_DEBUG */ static int batadv_debug_log_setup(struct batadv_priv *bat_priv) { - bat_priv->debug_log = NULL; return 0; } diff --git a/soft-interface.c b/soft-interface.c index adafa96..a8eb963 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -494,7 +494,9 @@ struct net_device *batadv_softif_create(const char *name) atomic_set(&bat_priv->gw_bandwidth, 41); atomic_set(&bat_priv->orig_interval, 1000); atomic_set(&bat_priv->hop_penalty, 30); +#ifdef CONFIG_BATMAN_ADV_DEBUG atomic_set(&bat_priv->log_level, 0); +#endif atomic_set(&bat_priv->fragmentation, 1); atomic_set(&bat_priv->bcast_queue_left, BATADV_BCAST_QUEUE_LEN); atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN); diff --git a/types.h b/types.h index 441880a..d8061ac 100644 --- a/types.h +++ b/types.h @@ -284,12 +284,16 @@ struct batadv_priv { atomic_t gw_bandwidth; /* gw bandwidth */ atomic_t orig_interval; /* uint */ atomic_t hop_penalty; /* uint */ +#ifdef CONFIG_BATMAN_ADV_DEBUG atomic_t log_level; /* uint */ +#endif atomic_t bcast_seqno; atomic_t bcast_queue_left; atomic_t batman_queue_left; char num_ifaces; +#ifdef CONFIG_BATMAN_ADV_DEBUG struct batadv_debug_log *debug_log; +#endif struct kobject *mesh_obj; struct dentry *debug_dir; struct hlist_head forw_bat_list;