net: minor indentation updates

Commit Message

Prasad Pandit Feb. 17, 2016, 12:35 p.m. UTC

From: Prasad J Pandit <[e-mail]>

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

Signed-off-by: Prasad J Pandit <[e-mail]>
---
 net/checksum.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Comments

Eric Blake Feb. 17, 2016, 1:47 p.m. UTC | #1

On 02/17/2016 05:35 AM, P J P wrote:
> From: Prasad J Pandit <[e-mail]>
> 
> Due indentation and braces were missing at places, added them.
> 

Cleaning up existing code is best done as part of a series that is
otherwise touching the code; doing it in isolation makes 'git blame'
attribute the wrong author for no good reason.

> Signed-off-by: Prasad J Pandit <[e-mail]>
> ---
>  net/checksum.c | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/net/checksum.c b/net/checksum.c
> index e51698c..a8c47e3 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);

If we DO decide the touch-up is worth it, please add spaces around the
binary + as part of the cleanup.

Prasad Pandit Feb. 17, 2016, 6:54 p.m. UTC | #2

+-- On Wed, 17 Feb 2016, Eric Blake wrote --+
| Cleaning up existing code is best done as part of a series that is
| otherwise touching the code; doing it in isolation makes 'git blame'
| attribute the wrong author for no good reason.

  Ah, okay. I noticed it while patching 'net_checksum_calculate' routine. 
Should have sent both together.
 
| If we DO decide the touch-up is worth it, please add spaces around the
| binary + as part of the cleanup.

  Okay.

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F

Patch

diff --git a/net/checksum.c b/net/checksum.c
index e51698c..a8c47e3 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;
 }
 
@@ -59,21 +60,22 @@  void net_checksum_calculate(uint8_t *data, int length)
     int hlen, plen, proto, csum_offset;
     uint16_t csum;
 
-    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)) {