From bzolnier@gmail.com Fri Jul 10 16:01:27 2009 From: Bartlomiej Zolnierkiewicz Date: Fri, 03 Jul 2009 16:07:54 +0200 Subject: Staging: rtl8192su: remove RTL8192S_PREPARE_FOR_NORMAL_RELEASE ifdefs To: "Greg Kroah-Hartman" Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Message-ID: <20090703140754.7303.71193.sendpatchset@localhost.localdomain> From: Bartlomiej Zolnierkiewicz Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192U_core.c | 8 -------- 2 files changed, 9 deletions(-) --- 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 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c @@ -6572,7 +6572,6 @@ static void rtl8192SU_SetHwRegAmpduMinSp u8 MinSpacingToSet; u8 SecMinSpace; -#ifdef RTL8192S_PREPARE_FOR_NORMAL_RELEASE MinSpacingToSet = MinSpaceCfg; if(MinSpacingToSet <= 7) { @@ -6593,13 +6592,6 @@ static void rtl8192SU_SetHwRegAmpduMinSp 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