From patchwork Sat Jan 12 16:09:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Fleytman X-Patchwork-Id: 211512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 995E02C00FD for ; Sun, 13 Jan 2013 03:30:41 +1100 (EST) Received: from localhost ([::1]:37417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu3yh-0007lk-NA for incoming@patchwork.ozlabs.org; Sat, 12 Jan 2013 11:30:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu3yY-0007lV-0S for qemu-devel@nongnu.org; Sat, 12 Jan 2013 11:30:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tu3yS-0000Ek-Li for qemu-devel@nongnu.org; Sat, 12 Jan 2013 11:30:29 -0500 Received: from mail-wi0-f176.google.com ([209.85.212.176]:35426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu3yS-0000EV-Ff for qemu-devel@nongnu.org; Sat, 12 Jan 2013 11:30:24 -0500 Received: by mail-wi0-f176.google.com with SMTP id hm6so438328wib.15 for ; Sat, 12 Jan 2013 08:30:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=EG+TfB5TvRfNa5WSur/dmVH0tJvjfGs9BIhGlazR0iU=; b=A6vwQkXmijPgxsAqg1CVgxeNk9rtGpqaJ9RDwdHlSzZ5QEYTw7mw8k+PQEMMZkV8Hx ycLV/xuWbVuMh3Vf9hb1UqgzuMCbLhra7u23bzlx3HRTso/KqxniQv4S2Fisab8awuAR xcQVBCvT+0EzGK8yFOqBypwyMLFDswf+/+6kXZLMU8WIDbW36W4kkdgEyFspmtkYl8NJ TgVkKcDJEWExMvBAPu15p9s6/g6G8u7RXGGGYzC1FyfQyFRRMp9p3N2OrNlFAYoxQ9v6 lpVMovRGdJLdH7O3TdbzhGmEvSZLH759YKq0/gKbA2mc9/lanCFpUr2z84pAsd1GKTGi +ziQ== X-Received: by 10.180.93.3 with SMTP id cq3mr4844496wib.1.1358007909958; Sat, 12 Jan 2013 08:25:09 -0800 (PST) Received: from Snarl.daynix ([91.205.155.63]) by mx.google.com with ESMTPS id s16sm4579394wii.0.2013.01.12.08.25.07 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 12 Jan 2013 08:25:09 -0800 (PST) From: Dmitry Fleytman To: qemu-devel@nongnu.org Date: Sat, 12 Jan 2013 18:09:42 +0200 Message-Id: <1358006986-7248-2-git-send-email-dmitry@daynix.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358006986-7248-1-git-send-email-dmitry@daynix.com> References: <1358006986-7248-1-git-send-email-dmitry@daynix.com> X-Gm-Message-State: ALoCoQkvnWd8WHPtE+fJdn0mkpWuH37C8lDqTOrWNT4FyS5o4lJemMU1qmLXLZBVB32p0qcHYwcd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.212.176 Cc: Dmitry Fleytman , Yan Vugenfirer , Anthony Liguori , Gerhard Wiesinger , Paolo Bonzini Subject: [Qemu-devel] [PATCH v9 1/5] Adding utility function net_checksum_add_cont() that allows checksum calculation of scattered data with odd chunk sizes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Adding utility function net_raw_checksum() that calculates checksum of buffer given Signed-off-by: Dmitry Fleytman Signed-off-by: Yan Vugenfirer --- include/net/checksum.h | 14 +++++++++++++- net/checksum.c | 13 +++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/include/net/checksum.h b/include/net/checksum.h index 1f05298..171924c 100644 --- a/include/net/checksum.h +++ b/include/net/checksum.h @@ -20,10 +20,22 @@ #include -uint32_t net_checksum_add(int len, uint8_t *buf); +uint32_t net_checksum_add_cont(int len, uint8_t *buf, int seq); uint16_t net_checksum_finish(uint32_t sum); uint16_t net_checksum_tcpudp(uint16_t length, uint16_t proto, uint8_t *addrs, uint8_t *buf); void net_checksum_calculate(uint8_t *data, int length); +static inline uint32_t +net_checksum_add(int len, uint8_t *buf) +{ + return net_checksum_add_cont(len, buf, 0); +} + +static inline uint16_t +net_raw_checksum(uint8_t *data, int length) +{ + return net_checksum_finish(net_checksum_add(length, data)); +} + #endif /* QEMU_NET_CHECKSUM_H */ diff --git a/net/checksum.c b/net/checksum.c index 9919b2e..4fa5563 100644 --- a/net/checksum.c +++ b/net/checksum.c @@ -20,16 +20,17 @@ #define PROTO_TCP 6 #define PROTO_UDP 17 -uint32_t net_checksum_add(int len, uint8_t *buf) +uint32_t net_checksum_add_cont(int len, uint8_t *buf, int seq) { uint32_t sum = 0; int i; - for (i = 0; i < len; i++) { - if (i & 1) - sum += (uint32_t)buf[i]; - else - sum += (uint32_t)buf[i] << 8; + for (i = seq; i < seq + len; i++) { + if (i & 1) { + sum += (uint32_t)buf[i - seq]; + } else { + sum += (uint32_t)buf[i - seq] << 8; + } } return sum; }