Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

[karo-tx-linux.git] / drivers / staging / vt6655 / tkip.c

diff --git a/drivers/staging/vt6655/tkip.c b/drivers/staging/vt6655/tkip.c
index ccdcdf5731c965a6b829105ffe9df04dcbbde7f0..b3e087e19034f31d5aca3494add801586fad3b2e 100644 (file)
--- a/drivers/staging/vt6655/tkip.c
+++ b/drivers/staging/vt6655/tkip.c
@@ -125,7 +125,6 @@ const unsigned char TKIP_Sbox_Upper[256] = {
        0x82, 0x29, 0x5A, 0x1E, 0x7B, 0xA8, 0x6D, 0x2C
 };
 
-
 //STKIPKeyManagement  sTKIPKeyTable[MAX_TKIP_KEY];
 
 /*---------------------  Static Functions  --------------------------*/
@@ -151,10 +150,9 @@ unsigned int tkip_sbox(unsigned int index)
        left = TKIP_Sbox_Lower[index_low] + (TKIP_Sbox_Upper[index_low] * 256);
        right = TKIP_Sbox_Upper[index_high] + (TKIP_Sbox_Lower[index_high] * 256);
 
-       return (left ^ right);
+       return left ^ right;
 };
 
-
 unsigned int rotr1(unsigned int a)
 {
        unsigned int b;
@@ -168,7 +166,6 @@ unsigned int rotr1(unsigned int a)
        return b;
 }
 
-
 /*
  * Description: Calculate RC4Key fom TK, TA, and TSC
  *