From patchwork Wed Jun 2 22:58:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 215 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id 9BE051543EE for ; Thu, 3 Jun 2010 00:58:51 +0200 (CEST) Received: (qmail invoked by alias); 02 Jun 2010 22:58:51 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [88.130.156.199] by mail.gmx.net (mp008) with SMTP; 03 Jun 2010 00:58:51 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1/4yJ8BRqT4ZMasCUd7xajdq5OsdlA7yytycmASPV r85e3b74A4xIuM From: Sven Eckelmann To: b.a.t.m.a.n@open-mesh.net Date: Thu, 3 Jun 2010 00:58:36 +0200 Message-Id: <1275519516-21394-3-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1275519516-21394-1-git-send-email-sven.eckelmann@gmx.de> References: <1275519516-21394-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH 3/3] batman-experimental: 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:52 -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 Cc: Axel Neumann --- batman-experimental/posix/tunnel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-experimental/posix/tunnel.c b/batman-experimental/posix/tunnel.c index 8911dcc..c1aba5c 100644 --- a/batman-experimental/posix/tunnel.c +++ b/batman-experimental/posix/tunnel.c @@ -466,7 +466,7 @@ static int8_t set_tun_addr( int32_t fd, uint32_t tun_addr, char *tun_dev ) { static void get_gw_speeds( unsigned char class, int *down, int *up ) { char sbit = (class&0x80)>>7; - char dpart = (class&0x7C)>>3; + char dpart = (class&0x78)>>3; char upart = (class&0x07); *down= 32*(sbit+2)*(1<