From bzolnier@gmail.com Fri Jul 10 16:00:44 2009 From: Bartlomiej Zolnierkiewicz Date: Fri, 03 Jul 2009 16:07:20 +0200 Subject: Staging: rtl8192su: remove RTL8192SU_FPGA_UNSPECIFIED_NETWORK ifdefs To: "Greg Kroah-Hartman" Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Message-ID: <20090703140720.7303.70842.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 | 22 ---------------------- 2 files changed, 23 deletions(-) --- a/drivers/staging/rtl8192su/Makefile +++ b/drivers/staging/rtl8192su/Makefile @@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 #EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0 EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c @@ -2957,19 +2957,6 @@ short rtl8192SU_tx(struct net_device *de memset(tx_desc, 0, sizeof(tx_desc_819x_usb)); -#if RTL8192SU_FPGA_UNSPECIFIED_NETWORK - if(IsQoSDataFrame(skb->data)) - { - tcb_desc->bAMPDUEnable = TRUE; - tx_desc->NonQos = 0; - } - else - tcb_desc->bAMPDUEnable = FALSE; - - tcb_desc->bPacketBW = TRUE; - priv->CurrentChannelBW = HT_CHANNEL_WIDTH_20_40; -#endif - #if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION)||defined (RTL8192SU_ASIC_VERIFICATION)) tx_desc->NonQos = (IsQoSDataFrame(skb->data)==TRUE)? 0:1; #endif @@ -7280,15 +7267,6 @@ start: // We return status here for temporal FPGA verification. 2008.05.12. // -#if RTL8192SU_FPGA_UNSPECIFIED_NETWORK - // - // To send specific number of packets to verify MAC Lookback mode. - // - //SendRandomTxPkt(Adapter, 0); // Burst mode for verification. - //rtStatus = RT_STATUS_FAILURE; - rtStatus = true; - goto end; -#endif // The following IO was for FPGA verification purpose. Added by Roger, 2008.09.11. #if 0