Drivers: Staging: CSR: Fixed indentation problems on data_tx.c

PATCH In review Sangho Yi 3 participants 9 messages Oct 14, 2012 – Oct 22, 2012 Staging

lore

Share & tools

lore

Sangho Yi

author

2012-10-14 15:18 UTC #0 lore raw

PATCH 1/4 Drivers: Staging: CSR: Fixed indentation problems on data_tx.c

Originally, the data_tx.c was indented with 4 spaces, so I fixed the indentation using a single tab.

Signed-off-by Sangho Yi <[email protected]>

---
 drivers/staging/csr/data_tx.c |   58 ++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

drivers/staging/csr/data_tx.c +29 ~~-29~~

index 8ed7a78..8af0358 100644
@@ -15,36 +15,37 @@
 #include "csr_wifi_hip_unifi.h"
 #include "unifi_priv.h"
 
-int
-uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int length)
-{
-    const unsigned char *p = packet;
-    u16 keyinfo;
+int uf_verify_m4 (unifi_priv_t *priv, const unsigned char *packet,
+	unsigned int length) {
+	const unsigned char *p = packet;
+	u16 keyinfo;
 
+	if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8)) {
+		return 1;
+	}
 
-    if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8)) {
-        return 1;
-    }
-
-    p += 8;
-    keyinfo = p[5] << 8 | p[6]; /* big-endian */
-    if (
-          (p[0] == 1 || p[0] == 2) /* protocol version 802.1X-2001 (WPA) or -2004 (WPA2) */ &&
-          p[1] == 3 /* EAPOL-Key */ &&
-          /* don't bother checking p[2] p[3] (hh ll, packet body length) */
-          (p[4] == 254 || p[4] == 2) /* descriptor type P802.1i-D3.0 (WPA) or 802.11i-2004 (WPA2) */ &&
-          ((keyinfo & 0x0007) == 1 || (keyinfo & 0x0007) == 2) /* key descriptor version */ &&
-         (keyinfo & ~0x0207U) == 0x0108 && /* key info for 4/4 or 4/2 -- ignore key desc version and sec bit (since varies in WPA 4/4) */
-          (p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 0] == 0 && /* key data length (2 octets) 0 for 4/4 only */
-           p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1] == 0)
-        ) {
-        unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected \n");
-        return 0;
-    }
-    else
-    {
-        return 1;
-    }
+	p += 8;
+	keyinfo = p[5] << 8 | p[6]; /* big-endian */
+	if ((p[0] == 1 || p[0] == 2) &&
+		/* protocol version 802.1X-2001 (WPA) or -2004 (WPA2) */
+		p[1] == 3 && /* EAPOL-Key */
+		/* don't bother checking p[2] p[3]
+		 * (hh ll, packet body length) */
+		(p[4] == 254 || p[4] == 2) &&
+		/* descriptor type P802.1i-D3.0 (WPA) or 802.11i-2004 (WPA2) */
+		((keyinfo & 0x0007) == 1 || (keyinfo & 0x0007) == 2) &&
+		/* key descriptor version */
+		((keyinfo & ~0x0207U) == 0x0108) &&
+		/* key info for 4/4 or 4/2 -- ignore key desc version and
+		 * sec bit (since varies in WPA 4/4) */
+		((p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 0] == 0) &&
+		/* key data length (2 octets) 0 for 4/4 only */
+		p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1] == 0)) {
+		unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected \n");
+		return 0;
+	} else {
+		return 1;
+	}
 }
 
 /*

@@ -54,4 +55,3 @@ uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int lengt
  *
  * ---------------------------------------------------------------------------
  */
-

Signature · 1 line

1.7.9.5

Sangho Yi

author

2012-10-14 15:19 UTC #1 lore raw

PATCH 2/4 Drivers: Staging: CSR: Removed braces for single line if statement

It was a very minor fix that an if statement had curly braces with just single line of code inside.

Signed-off-by Sangho Yi <[email protected]>

---
 drivers/staging/csr/data_tx.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/staging/csr/data_tx.c +1 -2

index 8af0358..1bea7f0 100644
@@ -20,9 +20,8 @@ int uf_verify_m4 (unifi_priv_t *priv, const unsigned char *packet,
 	const unsigned char *p = packet;
 	u16 keyinfo;
 
-	if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8)) {
+	if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8))
 		return 1;
-	}
 
 	p += 8;
 	keyinfo = p[5] << 8 | p[6]; /* big-endian */

Signature · 1 line

1.7.9.5

Greg KH

maintainer

2012-10-22 21:02 UTC #2 lore raw

Re: [PATCH 2/4] Drivers: Staging: CSR: Removed braces for single line if statement

Quoted 7 lines · Sangho Yi

It was a very minor fix that an if statement had curly braces with just single line of code inside.
Signed-off-by Sangho Yi <[email protected]>
---
 drivers/staging/csr/data_tx.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Doesn't apply as I already did this patch :(

greg k-h

Sangho Yi

author

2012-10-14 15:19 UTC #3 lore raw

PATCH 3/4 Drivers: Staging: CSR: Removed whitespace between function name and (

In reply to Sangho Yi

Removed the unnecessary whitespace between function name and the "(", according to the coding style.

Signed-off-by Sangho Yi <[email protected]>

---
 drivers/staging/csr/data_tx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/csr/data_tx.c +1 -1

index 1bea7f0..160a6c5 100644
@@ -15,7 +15,7 @@
 #include "csr_wifi_hip_unifi.h"
 #include "unifi_priv.h"
 
-int uf_verify_m4 (unifi_priv_t *priv, const unsigned char *packet,
+int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet,
 	unsigned int length) {
 	const unsigned char *p = packet;
 	u16 keyinfo;

Signature · 1 line

1.7.9.5

Greg KH

maintainer

2012-10-22 21:03 UTC #4 lore raw

Re: [PATCH 3/4] Drivers: Staging: CSR: Removed whitespace between function name and (

Quoted 7 lines · Sangho Yi

Removed the unnecessary whitespace between function name and the "(", according to the coding style.
Signed-off-by Sangho Yi <[email protected]>
---
 drivers/staging/csr/data_tx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Also doesn't apply :(

Sangho Yi

author

2012-10-14 15:19 UTC #5 lore raw

PATCH 4/4 Drivers: Staging: CSR: Removed whitespace before quoting newline

In reply to Sangho Yi

Removed the unnecessary whitespace before \n on the printing statement.

Signed-off-by Sangho Yi <[email protected]>

---
 drivers/staging/csr/data_tx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/csr/data_tx.c +1 -1

index 160a6c5..f3c1cc3 100644
@@ -40,7 +40,7 @@ int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet,
 		((p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 0] == 0) &&
 		/* key data length (2 octets) 0 for 4/4 only */
 		p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1] == 0)) {
-		unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected \n");
+		unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected\n");
 		return 0;
 	} else {
 		return 1;

Signature · 1 line

1.7.9.5

Greg KH

maintainer

2012-10-22 21:03 UTC #6 lore raw

Re: [PATCH 4/4] Drivers: Staging: CSR: Removed whitespace before quoting newline

Quoted 3 lines · Sangho Yi

Removed the unnecessary whitespace before \n on the printing statement.
Signed-off-by Sangho Yi <[email protected]>

This one didn't apply either.

greg k-h

Dan Carpenter

2012-10-18 13:31 UTC #7 lore raw

In reply to Sangho Yi

drivers/staging/csr/data_tx.c line 19

Quoted 11 lines · Sangho Yi

drivers/staging/csr/data_tx.c +2 -5

@@ -15,36 +15,37 @@
 #include "csr_wifi_hip_unifi.h"
 #include "unifi_priv.h"
 
-int
-uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int length)
-{
-    const unsigned char *p = packet;
-    u16 keyinfo;
+int uf_verify_m4 (unifi_priv_t *priv, const unsigned char *packet,
+	unsigned int length) {

The original was correct. The new code is wrong.

regards,
dan carpenter

Greg KH

maintainer

2012-10-22 21:00 UTC #8 lore raw

In reply to Sangho Yi

Quoted 7 lines · Sangho Yi

Originally, the data_tx.c was indented with 4 spaces, so I fixed the indentation using a single tab.
Signed-off-by Sangho Yi <[email protected]>
---
 drivers/staging/csr/data_tx.c |   58 ++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

Any reason you modified the same file I did during the presentation?

I've applied my patch already, this one doesn't apply now.

sorry,

greg k-h