From patchwork Wed Aug 24 13:00:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 111344 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BC8FFB6F70 for ; Wed, 24 Aug 2011 23:01:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755102Ab1HXNBQ (ORCPT ); Wed, 24 Aug 2011 09:01:16 -0400 Received: from nm4.bullet.mail.ukl.yahoo.com ([217.146.182.225]:47884 "HELO nm4.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752897Ab1HXNBP (ORCPT ); Wed, 24 Aug 2011 09:01:15 -0400 Received: from [217.146.183.183] by nm4.bullet.mail.ukl.yahoo.com with NNFMP; 24 Aug 2011 13:01:13 -0000 Received: from [77.238.184.53] by tm14.bullet.mail.ukl.yahoo.com with NNFMP; 24 Aug 2011 13:01:13 -0000 Received: from [127.0.0.1] by smtp122.mail.ukl.yahoo.com with NNFMP; 24 Aug 2011 13:01:13 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1314190873; bh=mfGWrErP5SZslg8mv7g8c2cKj6Ifv48AiUaQodoZDtc=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=GmVis0wXvQD1WCsY8L7TAwJ7BKb4lq2zyc+hT6NpvvBJG0TOgm3mTDCkIWwbINCb/8A6WJqBuHmFCFefwTTuGYeWoD/2LTS50rCJlzNoVrCKKh4m35ZYewCqaUzFCTelFCuBjFZgAY7iW5Y4dhkBMxqQizqM3lB3h3Jw/yEzIHk= X-Yahoo-Newman-Id: 527028.48113.bm@smtp122.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 26gOkmAVM1kHLm59tZyh0SKcAlKbqM2HslYBZNXN7c0ccFD sg6nLxauL X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@90.61.151.134 with plain) by smtp122.mail.ukl.yahoo.com with SMTP; 24 Aug 2011 13:01:13 +0000 GMT From: Marek Lindner To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Marek Lindner Subject: [PATCH 7/8] batman-adv: reuse tt_len() to calculate tt buffer length Date: Wed, 24 Aug 2011 15:00:37 +0200 Message-Id: <1314190838-2273-8-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1314190838-2273-1-git-send-email-lindner_marek@yahoo.de> References: <1314190838-2273-1-git-send-email-lindner_marek@yahoo.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Marek Lindner Acked-by: Antonio Quartulli --- net/batman-adv/aggregation.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/aggregation.h b/net/batman-adv/aggregation.h index 216337b..df4a5a9 100644 --- a/net/batman-adv/aggregation.h +++ b/net/batman-adv/aggregation.h @@ -28,8 +28,7 @@ static inline int aggregated_packet(int buff_pos, int packet_len, int tt_num_changes) { - int next_buff_pos = buff_pos + BAT_PACKET_LEN + (tt_num_changes * - sizeof(struct tt_change)); + int next_buff_pos = buff_pos + BAT_PACKET_LEN + tt_len(tt_num_changes); return (next_buff_pos <= packet_len) && (next_buff_pos <= MAX_AGGREGATION_BYTES);