diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-07-03 16:07:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:38 -0700 |
| commit | 8b804677f9d38f07e2e8644e3a96440759cdfa76 (patch) | |
| tree | acd3e08e13611812587d5003f059ccd165414ab7 /drivers/staging/rtl8192su | |
| parent | 68b6f506c675b5c70a99b861d3044c388d35858d (diff) | |
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>
Diffstat (limited to 'drivers/staging/rtl8192su')
| -rw-r--r-- | drivers/staging/rtl8192su/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_core.c | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile index 2cbc32c5b4a7..25f30aea6ab9 100644 --- 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 48e161072b7e..f2571cc5d4c3 100644 --- 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 |