Staging: rtl8192su: remove RTL8192S_PREPARE_FOR_NORMAL_RELEASE ifdefs

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile
index 2cbc32c5b4a73dd2b7a5a6da1617c737361ae7ab..25f30aea6ab9d9cf0fb1c4bcb3d80296ea1b3c58 100644 (file)
--- a/drivers/staging/rtl8192su/Makefile
+++ b/drivers/staging/rtl8192su/Makefile
@@ -8,7 +8,6 @@ EXTRA_CFLAGS += -DJACKSON_NEW_RX
 EXTRA_CFLAGS += -DTHOMAS_BEACON
 
 EXTRA_CFLAGS += -DRTL8192SU
-EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE
 EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1
 
 #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT

diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index 48e161072b7eef25ec805d5ebc488ace7d4f23a4..f2571cc5d4c32635d6bce62368c8dee70629d43c 100644 (file)
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
@@ -6572,7 +6572,6 @@ static void rtl8192SU_SetHwRegAmpduMinSpace(struct net_device *dev, u8 MinSpaceC
        u8      MinSpacingToSet;
        u8      SecMinSpace;
 
-#ifdef RTL8192S_PREPARE_FOR_NORMAL_RELEASE
        MinSpacingToSet = MinSpaceCfg;
        if(MinSpacingToSet <= 7)
        {
@@ -6593,13 +6592,6 @@ static void rtl8192SU_SetHwRegAmpduMinSpace(struct net_device *dev, u8 MinSpaceC
                write_nic_byte(dev, AMPDU_MIN_SPACE, priv->MinSpaceCfg);
        }
 
-#else
-       MinSpacingToSet = MinSpaceCfg;
-       MinSpacingToSet &= 0x07; // We only care about bit[2:0]
-       priv->MinSpaceCfg |= MinSpacingToSet;
-       RT_TRACE(COMP_SEC, "Set AMPDU_MIN_SPACE: %x\n", priv->MinSpaceCfg);
-       write_nic_byte(dev, AMPDU_MIN_SPACE, priv->MinSpaceCfg);//FIXLZM
-#endif
 }
 #endif