qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: P J P <ppandit@redhat.com>
To: Qemu Developers <qemu-devel@nongnu.org>
Cc: Jason Wang <jasowang@redhat.com>,
	Prasad J Pandit <pjp@fedoraproject.org>,
	Markus Armbruster <armbru@redhat.com>,
	Liu Ling <liuling-it@360.cn>
Subject: [Qemu-devel] [PATCH v2 2/2] net: minor indentation updates
Date: Tue, 23 Feb 2016 21:38:27 +0530	[thread overview]
Message-ID: <1456243707-29345-3-git-send-email-ppandit@redhat.com> (raw)
In-Reply-To: <1456243707-29345-1-git-send-email-ppandit@redhat.com>

From: Prasad J Pandit <pjp@fedoraproject.org>

Due indentation and braces were missing at places, added them.

Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
 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) {
-- 
2.5.0

      parent reply	other threads:[~2016-02-23 16:09 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-23 16:08 [Qemu-devel] [PATCH v2 0/2] net: check payload length and minor updates P J P
2016-02-23 16:08 ` [Qemu-devel] [PATCH v2 1/2] net: check packet payload length P J P
2016-02-26  6:10   ` Jason Wang
2016-03-01  6:48     ` P J P
2016-03-02  3:21       ` Jason Wang
2016-03-02 12:01         ` P J P
2016-02-23 16:08 ` P J P [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1456243707-29345-3-git-send-email-ppandit@redhat.com \
    --to=ppandit@redhat.com \
    --cc=armbru@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=liuling-it@360.cn \
    --cc=pjp@fedoraproject.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).