From patchwork Tue Feb 23 16:08:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 8394111 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4B3A59F1D4 for ; Tue, 23 Feb 2016 16:11:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C243202EC for ; Tue, 23 Feb 2016 16:11:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A3F22202E9 for ; Tue, 23 Feb 2016 16:11:10 +0000 (UTC) Received: from localhost ([::1]:58147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYFYL-0004bV-Uc for patchwork-qemu-devel@patchwork.kernel.org; Tue, 23 Feb 2016 11:11:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYFWF-0001Ov-OW for qemu-devel@nongnu.org; Tue, 23 Feb 2016 11:09:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYFWB-0003p2-N5 for qemu-devel@nongnu.org; Tue, 23 Feb 2016 11:08:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYFWB-0003ox-IH for qemu-devel@nongnu.org; Tue, 23 Feb 2016 11:08:55 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 49358C00B8F2; Tue, 23 Feb 2016 16:08:55 +0000 (UTC) Received: from javelin.localdomain (vpn1-48-150.bne.redhat.com [10.64.48.150]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1NG8U37032034 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 23 Feb 2016 11:08:49 -0500 From: P J P To: Qemu Developers Date: Tue, 23 Feb 2016 21:38:27 +0530 Message-Id: <1456243707-29345-3-git-send-email-ppandit@redhat.com> In-Reply-To: <1456243707-29345-1-git-send-email-ppandit@redhat.com> References: <1456243707-29345-1-git-send-email-ppandit@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Jason Wang , Prasad J Pandit , Markus Armbruster , Liu Ling Subject: [Qemu-devel] [PATCH v2 2/2] net: minor indentation updates 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Prasad J Pandit Due indentation and braces were missing at places, added them. Signed-off-by: Prasad J Pandit --- net/checksum.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) Update as per review: -> https://lists.gnu.org/archive/html/qemu-devel/2016-02/msg03799.html diff --git a/net/checksum.c b/net/checksum.c index bd89083..c3f1f71 100644 --- a/net/checksum.c +++ b/net/checksum.c @@ -38,8 +38,9 @@ uint32_t net_checksum_add_cont(int len, uint8_t *buf, int seq) uint16_t net_checksum_finish(uint32_t sum) { - while (sum>>16) - sum = (sum & 0xFFFF)+(sum >> 16); + while (sum >> 16) { + sum = (sum & 0xFFFF) + (sum >> 16); + } return ~sum; } @@ -63,22 +64,23 @@ void net_checksum_calculate(uint8_t *data, int length) if (length < 14 + 20) { return; } + if ((data[14] & 0xf0) != 0x40) { + return; /* not IPv4 */ + } - if ((data[14] & 0xf0) != 0x40) - return; /* not IPv4 */ hlen = (data[14] & 0x0f) * 4; plen = (data[16] << 8 | data[17]) - hlen; proto = data[23]; switch (proto) { case PROTO_TCP: - csum_offset = 16; - break; + csum_offset = 16; + break; case PROTO_UDP: - csum_offset = 6; - break; + csum_offset = 6; + break; default: - return; + return; } if (plen < csum_offset + 2 || plen + hlen >= length) {