From patchwork Sat Nov 5 17:24:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 1369 Return-Path: Received: from nick.hrz.tu-chemnitz.de (nick.hrz.tu-chemnitz.de [134.109.228.11]) by open-mesh.org (Postfix) with ESMTPS id 210DA60084F for ; Sat, 5 Nov 2011 18:24:56 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@tu-chemnitz.de; dkim-adsp=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tu-chemnitz.de; s=dkim2010; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=gu/8yraNlG+B9ybeVS9gxTyyqKE18S/4P4gjjYzXNZc=; b=lCFap8cHIRcwvtGETHzOfBiA+7X9M9Mfq0ELudHMcPN7INAm3VQn6xMsseXFgHBt3zKN0/cHf5CF1UNpU4om9oYFW2PQxiCSs2NLxfxVfK7RJNdGqPcN05WRyCFDTuw8I1ZxPONVKSxJt9lMGl2yNBRudY40/adA8JwOAVXe58U=; Received: from p57aa0226.dip0.t-ipconnect.de ([87.170.2.38] helo=pandem0nium) by nick.hrz.tu-chemnitz.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RMjzC-0002TV-Sn; Sat, 05 Nov 2011 18:24:55 +0100 Received: from dotslash by pandem0nium with local (Exim 4.72) (envelope-from ) id 1RMjz2-0007Op-5e; Sat, 05 Nov 2011 18:24:44 +0100 From: Simon Wunderlich To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 5 Nov 2011 18:24:22 +0100 Message-Id: <1320513862-28360-12-git-send-email-siwu@hrz.tu-chemnitz.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1320513862-28360-1-git-send-email-siwu@hrz.tu-chemnitz.de> References: <1320513862-28360-1-git-send-email-siwu@hrz.tu-chemnitz.de> X-Spam-Score: -1.0 (-) X-Spam-Report: --- Textanalyse SpamAssassin 3.3.1 (-1.0 Punkte) Fragen an/questions to: Postmaster TU Chemnitz * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP --- Ende Textanalyse X-Scan-Signature: 1297b590baf20303573237d09552d083 Cc: Simon Wunderlich Subject: [B.A.T.M.A.N.] [PATCH 11/11] batman-adv: add bridge loop avoidance compile option X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 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: Sat, 05 Nov 2011 17:24:56 -0000 The define CONFIG_BATMAN_ADV_BLA switches the bridge loop avoidance on - skip it, and the bridge loop avoidance is not compiled in. This is useful if binary size should be saved or the feature is not needed. Signed-off-by: Simon Wunderlich --- Makefile.kbuild | 1 + bat_debugfs.c | 7 ++++++- bat_sysfs.c | 4 ++++ bridge_loop_avoidance.c | 3 +++ bridge_loop_avoidance.h | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 1 deletions(-) diff --git a/Makefile.kbuild b/Makefile.kbuild index d626513..bbdbc9c 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -26,6 +26,7 @@ ifeq ($(MAKING_MODULES),1) endif # ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG +ccflags-y += -DCONFIG_BATMAN_ADV_BLA ifneq ($(REVISION),) ccflags-y += -DSOURCE_VERSION=\"$(REVISION)\" diff --git a/bat_debugfs.c b/bat_debugfs.c index 20d3fc9..7b6b889 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -240,12 +240,13 @@ static int transtable_global_open(struct inode *inode, struct file *file) return single_open(file, tt_global_seq_print_text, net_dev); } +#ifdef CONFIG_BATMAN_ADV_BLA static int bla_claim_table_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; return single_open(file, bla_claim_table_seq_print_text, net_dev); } - +#endif static int transtable_local_open(struct inode *inode, struct file *file) { @@ -279,7 +280,9 @@ struct bat_debuginfo bat_debuginfo_##_name = { \ static BAT_DEBUGINFO(originators, S_IRUGO, originators_open); static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open); static BAT_DEBUGINFO(transtable_global, S_IRUGO, transtable_global_open); +#ifdef CONFIG_BATMAN_ADV_BLA static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, bla_claim_table_open); +#endif static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open); static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open); @@ -287,7 +290,9 @@ static struct bat_debuginfo *mesh_debuginfos[] = { &bat_debuginfo_originators, &bat_debuginfo_gateways, &bat_debuginfo_transtable_global, +#ifdef CONFIG_BATMAN_ADV_BLA &bat_debuginfo_bla_claim_table, +#endif &bat_debuginfo_transtable_local, &bat_debuginfo_vis_data, NULL, diff --git a/bat_sysfs.c b/bat_sysfs.c index cb7a524..728abfc 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -379,7 +379,9 @@ static ssize_t store_gw_bwidth(struct kobject *kobj, struct attribute *attr, BAT_ATTR_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL); BAT_ATTR_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); +#ifdef CONFIG_BATMAN_ADV_BLA BAT_ATTR_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); +#endif BAT_ATTR_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu); BAT_ATTR_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode); @@ -397,7 +399,9 @@ BAT_ATTR_UINT(log_level, S_IRUGO | S_IWUSR, 0, 15, NULL); static struct bat_attribute *mesh_attrs[] = { &bat_attr_aggregated_ogms, &bat_attr_bonding, +#ifdef CONFIG_BATMAN_ADV_BLA &bat_attr_bridge_loop_avoidance, +#endif &bat_attr_fragmentation, &bat_attr_ap_isolation, &bat_attr_vis_mode, diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 3935522..6e5e006 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -33,6 +33,8 @@ #include #include +#ifdef CONFIG_BATMAN_ADV_BLA + static const uint8_t announce_mac[4] = {0x43, 0x05, 0x43, 0x05}; static void bla_periodic_work(struct work_struct *work); @@ -1587,3 +1589,4 @@ out: hardif_free_ref(primary_if); return ret; } +#endif /* ifdef CONFIG_BATMAN_ADV_BLA */ diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 88394a8..ee97ba7 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -19,6 +19,7 @@ * */ +#ifdef CONFIG_BATMAN_ADV_BLA int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid); int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid); int bla_is_backbone_gw(struct sk_buff *skb, @@ -33,3 +34,16 @@ int bla_init(struct bat_priv *bat_priv); void bla_free(struct bat_priv *bat_priv); #define BLA_CRC_INIT 0 +#else /* ifdef CONFIG_BATMAN_ADV_BLA */ + +#define bla_rx(...) (0) +#define bla_tx(...) (0) +#define bla_is_backbone_gw(...) (0) +#define bla_claim_table_seq_print_text (0) +#define bla_is_backbone_gw_orig(...) (0) +#define bla_check_bcast_duplist(...) (0) +#define bla_update_orig_address(...) {} +#define bla_init(...) (0) +#define bla_free(...) {} + +#endif /* ifdef CONFIG_BATMAN_ADV_BLA */