From patchwork Wed Jun 2 22:58:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 189 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id 2AF641542F6 for ; Thu, 3 Jun 2010 00:58:45 +0200 (CEST) Received: (qmail invoked by alias); 02 Jun 2010 22:58:44 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [88.130.156.199] by mail.gmx.net (mp045) with SMTP; 03 Jun 2010 00:58:44 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1+IAdY6U3uI4ZtJT8nD2AV7/Tivjv7SR1PbyVQcP/ /VmVUFDnhxuwz1 From: Sven Eckelmann To: b.a.t.m.a.n@open-mesh.net Date: Thu, 3 Jun 2010 00:58:34 +0200 Message-Id: <1275519516-21394-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH 1/3] batman: Correct gw_speed down bit mask X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 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: Wed, 02 Jun 2010 22:58:45 -0000 We want to get bits .OOOO... and not as the mask would suggest .OOOOO.. when we decode the encoded bits for the download part of the gateway speed. Reported-By: Bill Meier Signed-off-by: Sven Eckelmann --- batman/batman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman/batman.c b/batman/batman.c index 4374af5..ab689b2 100644 --- a/batman/batman.c +++ b/batman/batman.c @@ -482,7 +482,7 @@ void update_gw_list(struct orig_node *orig_node, uint8_t new_gwflags, uint16_t g void get_gw_speeds(unsigned char gw_class, int *down, int *up) { char sbit = (gw_class & 0x80) >> 7; - char dpart = (gw_class & 0x7C) >> 3; + char dpart = (gw_class & 0x78) >> 3; char upart = (gw_class & 0x07); *down = 32 * (sbit + 2) * (1 << dpart);