Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / staging / rtl8712 / rtl871x_security.c

diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
index 5ffc489e950150ba447fd92ba03015a6d223ed20..0912f52def99d9942cdb93aa2f177bac6174405f 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_security.c
+++ b/drivers/staging/rtl8712/rtl871x_security.c
@@ -272,6 +272,7 @@ static void secmicputuint32(u8 *p, u32 val)
 /* Convert from Us4Byte32 to Byte[] in a portable way */
 {
        long i;
+
        for (i = 0; i < 4; i++) {
                *p++ = (u8) (val & 0xff);
                val >>= 8;
@@ -765,6 +766,7 @@ static void xor_128(u8 *a, u8 *b, u8 *out)
 static void xor_32(u8 *a, u8 *b, u8 *out)
 {
        sint i;
+
        for (i = 0; i < 4; i++)
                out[i] = a[i] ^ b[i];
 }
@@ -798,6 +800,7 @@ static void next_key(u8 *key, sint round)
 static void byte_sub(u8 *in, u8 *out)
 {
        sint i;
+
        for (i = 0; i < 16; i++)
                out[i] = sbox(in[i]);
 }
@@ -1164,7 +1167,7 @@ u32 r8712_aes_encrypt(struct _adapter *padapter, u8 *pxmitframe)
                return _FAIL;
        pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + TXDESC_OFFSET;
        /* 4 start to encrypt each fragment */
-       if ((pattrib->encrypt == _AES_)) {
+       if (pattrib->encrypt == _AES_) {
                if (pattrib->psta)
                        stainfo = pattrib->psta;
                else
@@ -1175,7 +1178,7 @@ u32 r8712_aes_encrypt(struct _adapter *padapter, u8 *pxmitframe)
                        prwskeylen = 16;
                        for (curfragnum = 0; curfragnum < pattrib->nr_frags;
                             curfragnum++) {
-                               if ((curfragnum + 1) == pattrib->nr_frags) {\
+                               if ((curfragnum + 1) == pattrib->nr_frags) {
                                        length = pattrib->last_txcmdsz -
                                                 pattrib->hdrlen -
                                                 pattrib->iv_len -
@@ -1371,7 +1374,7 @@ u32 r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe)
        pframe = (unsigned char *)((union recv_frame *)precvframe)->
                 u.hdr.rx_data;
        /* 4 start to encrypt each fragment */
-       if ((prxattrib->encrypt == _AES_)) {
+       if (prxattrib->encrypt == _AES_) {
                stainfo = r8712_get_stainfo(&padapter->stapriv,
                                            &prxattrib->ta[0]);
                if (stainfo != NULL) {