Staging: rt2870: remove CONFIG_STA_SUPPORT ifdefs

[~andy/linux] / drivers / staging / rt2870 / common / rtmp_tkip.c

diff --git a/drivers/staging/rt2870/common/rtmp_tkip.c b/drivers/staging/rt2870/common/rtmp_tkip.c
index 2847409ff081624d1bfda62ef4c531c42fb7087b..61f4020aee88b034622ca8d6a6a9596e8e62d730 100644 (file)
--- a/drivers/staging/rt2870/common/rtmp_tkip.c
+++ b/drivers/staging/rt2870/common/rtmp_tkip.c
@@ -199,15 +199,9 @@ typedef    struct  PACKED _IV_CONTROL_
                        {
                                struct PACKED
                                {
-#ifdef RT_BIG_ENDIAN
-                                       UCHAR   KeyID:2;
-                                       UCHAR   ExtIV:1;
-                                       UCHAR   Rsvd:5;
-#else
                                        UCHAR   Rsvd:5;
                                        UCHAR   ExtIV:1;
                                        UCHAR   KeyID:2;
-#endif
                                }       field;
                                UCHAR           Byte;
                        }       CONTROL;
@@ -697,9 +691,6 @@ VOID        RTMPCalculateMICValue(
        // determine if this is a vlan packet
        if (((*(pSrc + 12) << 8) + *(pSrc + 13)) == 0x8100)
                vlan_offset = 4;
-
-#ifdef CONFIG_STA_SUPPORT
-#endif // CONFIG_STA_SUPPORT //
        {
                RTMPInitMICEngine(
                        pAd,
@@ -1117,10 +1108,6 @@ BOOLEAN RTMPSoftDecryptTKIP(
        UCHAR                   MIC[8];
        UCHAR                   TrailMIC[8];
 
-#ifdef RT_BIG_ENDIAN
-       RTMPFrameEndianChange(pAd, (PUCHAR)pData, DIR_READ, FALSE);
-#endif
-
        fc0 = *pData;
        fc1 = *(pData + 1);
 
@@ -1228,9 +1215,6 @@ BOOLEAN RTMPSoftDecryptTKIP(
                return (FALSE);
        }
 
-#ifdef RT_BIG_ENDIAN
-       RTMPFrameEndianChange(pAd, (PUCHAR)pData, DIR_READ, FALSE);
-#endif
        //DBGPRINT(RT_DEBUG_TRACE, "RTMPSoftDecryptTKIP Decript done!!\n");
        return TRUE;
 }
@@ -1271,10 +1255,6 @@ BOOLEAN RTMPSoftDecryptAES(
        UCHAR                   MIC[8];
        UCHAR                   TrailMIC[8];
 
-#ifdef RT_BIG_ENDIAN
-       RTMPFrameEndianChange(pAd, (PUCHAR)pData, DIR_READ, FALSE);
-#endif
-
        fc0 = *pData;
        fc1 = *(pData + 1);
 
@@ -1443,10 +1423,6 @@ BOOLEAN RTMPSoftDecryptAES(
                return FALSE;
        }
 
-#ifdef RT_BIG_ENDIAN
-       RTMPFrameEndianChange(pAd, (PUCHAR)pData, DIR_READ, FALSE);
-#endif
-
        return TRUE;
 }