From 5befc74980b06237521822e554a46dba7acc7c45 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 12 Oct 2012 14:58:40 +0900
Subject: [PATCH] --- yaml --- r: 337131 b: refs/heads/master c:
 dbff11c9d35ebd41268cf5137e0619509effd461 h: refs/heads/master i:   337129:
 276d5b19624298a08af6213263c4597d2e11c048   337127:
 89ae6db961cc962e8a76a546d2fc49031e9b1087 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/csr/data_tx.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 14fc627bd710..714f322897d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c5745cc0859b5a628d7c39530a953e3983e6c1c
+refs/heads/master: dbff11c9d35ebd41268cf5137e0619509effd461
diff --git a/trunk/drivers/staging/csr/data_tx.c b/trunk/drivers/staging/csr/data_tx.c
index d2c29545058e..878f59f06e21 100644
--- a/trunk/drivers/staging/csr/data_tx.c
+++ b/trunk/drivers/staging/csr/data_tx.c
@@ -22,9 +22,8 @@ uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int lengt
 	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 */
@@ -40,9 +39,7 @@ uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int lengt
 	) {
 		unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected \n");
 		return 0;
-	}
-	else
-	{
+	} else {
 		return 1;
 	}
 }