From patchwork Fri Jul 29 16:32:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1233 Return-Path: Received: from nm10-vm0.bullet.mail.ukl.yahoo.com (nm10-vm0.bullet.mail.ukl.yahoo.com [217.146.183.242]) by open-mesh.org (Postfix) with SMTP id 6344460081D for ; Fri, 29 Jul 2011 18:32:54 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.214] by nm10.bullet.mail.ukl.yahoo.com with NNFMP; 29 Jul 2011 16:32:53 -0000 Received: from [77.238.184.77] by tm7.bullet.mail.ukl.yahoo.com with NNFMP; 29 Jul 2011 16:32:53 -0000 Received: from [127.0.0.1] by smtp146.mail.ukl.yahoo.com with NNFMP; 29 Jul 2011 16:32:53 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1311957173; bh=FHgGJwacqPfX/jn5Ose2/qlS3Lfy2ONJQhKDUw4kH44=; 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; b=uO672yBNp4Z20WfwqRyYukAlnIBVqdMrBXHbVB+nYY0nh+fRuyMCiTm5Y7GLu/DMrsWZ/Zocw1N5yKqCxfAH1+EEndEKjVLmDpNvQb7AaeL7xhcZyG88IWwij9+gdLQ5dp8tQT+BZ0H61nWvwD+ZcLp5rcPHYmTIAfSwcTgSKWE= X-Yahoo-Newman-Id: 644934.8153.bm@smtp146.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 8UhVguMVM1m4ViZsM70oAvT1j4vEivSbMkI3sRglvINjPOS garIxew.Fg9F_4YUkYbj1o6_Lqehu4_ktieJvacCUE47Y8DwwogqIGFPFxBf FUnfHAnqWUAe9AkXk.fHYRxcyYY1MrOwyxmkvZiSsLYPUTYhRoL.Cuf0Uk13 L.Nh5I9PZY0tcyHQnMv6giKNWNUSJJN4NPXjtZEBeFoPiifpev8bVT3uTRYT dEFAayaD8CiaSFb_fzHZiudbUGtgDCZ6BSM1wi_YkKtH6_st.glDqJw_.b9B f43PfS.zsn_bmkhP.mOFMGRM0JG3ZcFdnG61avZKolK.7grz1rZLFWA-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@202.130.127.139 with plain) by smtp146.mail.ukl.yahoo.com with SMTP; 29 Jul 2011 16:32:52 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 29 Jul 2011 18:32:45 +0200 Message-Id: <1311957165-16335-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.3 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: reuse tt_len() to calculate tt buffer length 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: Fri, 29 Jul 2011 16:32:54 -0000 Signed-off-by: Marek Lindner Acked-by: Antonio Quartulli --- aggregation.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/aggregation.h b/aggregation.h index 216337b..df4a5a9 100644 --- a/aggregation.h +++ b/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);