From patchwork Sun Sep 28 09:18:14 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 5325 Received: from lana.hrz.tu-chemnitz.de (lana.hrz.tu-chemnitz.de [134.109.132.3]) by open-mesh.net (8.13.4/8.13.4/Debian-3sarge3) with ESMTP id m8S9MrEe009895 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Sun, 28 Sep 2008 11:22:54 +0200 Received: from galba.hrz.tu-chemnitz.de ([134.109.133.156] helo=mailbox.hrz.tu-chemnitz.de) by lana.hrz.tu-chemnitz.de with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1KjsPu-0001Dg-M2 for b.a.t.m.a.n@open-mesh.net; Sun, 28 Sep 2008 11:18:14 +0200 Received: from vpnclient-023.hrz.tu-chemnitz.de ([134.109.232.23] helo=sven-desktop) by mailbox.hrz.tu-chemnitz.de with smtp (Exim 4.69) (envelope-from ) id 1KjsPu-0000Eu-Bs for b.a.t.m.a.n@open-mesh.net; Sun, 28 Sep 2008 11:18:14 +0200 Received: by sven-desktop (nbSMTP-1.00) for uid 1000 sven.eckelmann@gmx.de; Sun, 28 Sep 2008 11:18:14 +0200 (CEST) Date: Sun, 28 Sep 2008 11:18:14 +0200 From: Sven Eckelmann To: b.a.t.m.a.n@open-mesh.net Message-ID: <20080928091814.GA7497@sven-desktop.lazhur.ath.cx> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Scan-Signature: ddb05343e7e50baad047250fd48c5445 Subject: [B.A.T.M.A.N.] [PATCH] Remove dead stores in batmand X-BeenThere: b.a.t.m.a.n@open-mesh.net X-Mailman-Version: 2.1.5 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, 28 Sep 2008 09:22:54 -0000 Signed-off-by: Sven Eckelmann --- batman/batman.c | 4 ++-- batman/originator.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/batman/batman.c b/batman/batman.c index d7e2389..eda5774 100644 --- a/batman/batman.c +++ b/batman/batman.c @@ -897,7 +897,7 @@ int8_t batman(void) char orig_str[ADDR_STR_LEN], neigh_str[ADDR_STR_LEN], ifaddr_str[ADDR_STR_LEN], oldorig_str[ADDR_STR_LEN]; int16_t hna_buff_count, hna_buff_len, packet_len, curr_packet_len; uint8_t forward_old, if_rp_filter_all_old, if_rp_filter_default_old, if_send_redirects_all_old, if_send_redirects_default_old; - uint8_t is_my_addr, is_my_orig, is_my_oldorig, is_broadcast, is_duplicate, is_bidirectional, is_bntog, has_directlink_flag; + uint8_t is_my_addr, is_my_orig, is_my_oldorig, is_broadcast, is_duplicate, is_bidirectional, has_directlink_flag; int8_t res; @@ -1005,7 +1005,7 @@ int8_t batman(void) addr_to_string(bat_packet->orig, orig_str, sizeof(orig_str)); addr_to_string(bat_packet->old_orig, oldorig_str, sizeof(oldorig_str)); - is_my_addr = is_my_orig = is_my_oldorig = is_broadcast = is_duplicate = is_bidirectional = is_bntog = 0; + is_my_addr = is_my_orig = is_my_oldorig = is_broadcast = 0; has_directlink_flag = (bat_packet->flags & DIRECTLINK ? 1 : 0); diff --git a/batman/originator.c b/batman/originator.c index 8097d4a..7f13f3d 100644 --- a/batman/originator.c +++ b/batman/originator.c @@ -219,8 +219,6 @@ void update_orig( struct orig_node *orig_node, struct bat_packet *in, uint32_t n if ( ( neigh_node->tq_avg > max_tq ) || ( ( neigh_node->tq_avg == max_tq ) && ( neigh_node->orig_node->bcast_own_sum[if_incoming->if_num] > max_bcast_own ) ) || ( ( orig_node->router == neigh_node ) && ( neigh_node->tq_avg == max_tq ) ) ) { - max_tq = neigh_node->tq_avg; - max_bcast_own = neigh_node->orig_node->bcast_own_sum[if_incoming->if_num]; best_neigh_node = neigh_node; }